Remove need for namedump by using macros and preprocessor.

Add a PDF_NAME(Foo) macro that evaluates to a pdf_obj for /Foo.
Use the C preprocessor to create the enum values and string table
from one include file instead of using a separate code generator tool.

1 files changed, 2 insertions, 19 deletions

diff --git a/Makefile b/Makefile
index 8e47e3a7..448efa64 100644
--- a/Makefile
+++ b/Makefile
@@ -147,7 +147,7 @@ PKCS7_SRC += $(wildcard source/helpers/pkcs7/pkcs7-openssl.c)
 endif
 
 FITZ_SRC_HDR := $(wildcard source/fitz/*.h)
-PDF_SRC_HDR := $(wildcard source/pdf/*.h) source/pdf/pdf-name-table.h
+PDF_SRC_HDR := $(wildcard source/pdf/*.h)
 XPS_SRC_HDR := $(wildcard source/xps/*.h)
 SVG_SRC_HDR := $(wildcard source/svg/*.h)
 HTML_SRC_HDR := $(wildcard source/html/*.h)
@@ -177,23 +177,6 @@ $(THREAD_OBJ) : $(THREAD_HDR)
 $(PKCS7_OBJ) : $(FITZ_HDR) $(PDF_HDR) $(PKCS7_HDR)
 $(SIGNATURE_OBJ) : $(PKCS7_HDR)
 
-# --- Generated PDF name tables ---
-
-NAMEDUMP_EXE := $(OUT)/scripts/namedump.exe
-
-include/mupdf/pdf.h : include/mupdf/pdf/name-table.h
-NAME_GEN := include/mupdf/pdf/name-table.h source/pdf/pdf-name-table.h
-$(NAME_GEN) : resources/pdf/names.txt
-	$(QUIET_GEN) $(NAMEDUMP_EXE) resources/pdf/names.txt $(NAME_GEN)
-
-ifneq "$(CROSSCOMPILE)" "yes"
-$(NAME_GEN) : $(NAMEDUMP_EXE)
-endif
-
-$(OUT)/source/pdf/pdf-object.o : source/pdf/pdf-name-table.h
-
-generate: $(NAME_GEN)
-
 # --- Generated embedded font files ---
 
 HEXDUMP_EXE := $(OUT)/scripts/hexdump.exe
@@ -522,7 +505,7 @@ all: libs apps
 clean:
 	rm -rf $(OUT)
 nuke:
-	rm -rf build/* generated $(NAME_GEN)
+	rm -rf build/* generated
 
 release:
 	$(MAKE) build=release