diff --git a/Makefile b/Makefile
index 94be64aa62d6a2830bc12d153a9f158d43aeafb6..656105b1c1de1d9709988bf77591889dabe78111 100644 (file)
--- a/Makefile
+++ b/Makefile
-MODULES := reader store alien typeregister textmodel fold
+# Modules, each containing:
+# * $(MODULE)/Make.inc -- makefile include
+# * $(MODULE)/$(MODULE).h -- minimal "interface" header file
+# * $(MODULE)/$(MODULE).ih -- internal/implementation header file
+# (only to be included by sources within the module)
+# * $(MODULE)/*.cc -- module source files
+MODULES := reader store alien typeregister textmodel fold typepath
-# Add module directories to the include path
-CFLAGS += -I. $(patsubst %,-I%,$(MODULES))
+CFLAGS += -I.
# Variables for the modules to write to
SRCS := odcread.cc
# Include the generated dependency files (if they exist)
-include $(SRCS:.cc=.d)
+
+
+# TODO:
+# Each module has a .ih file that should be *the only* include from the .cc
+# files. These .ih files should be pre-compiled, and dependency caching should
+# be based on the .ih files, not the .cc files.