From 238bdc5c367b4ed1218866b3bcdacbbbc4302a6a Mon Sep 17 00:00:00 2001
From: midipix <writeonce@midipix.org>
Date: Sat, 15 Dec 2018 08:15:19 -0500
Subject: project: generate core library objects under core/<subdir>.

---
 project/pycompile.mk | 46 ++++++++++++++++------------------------------
 1 file changed, 16 insertions(+), 30 deletions(-)

(limited to 'project/pycompile.mk')

diff --git a/project/pycompile.mk b/project/pycompile.mk
index 1cf9333..3c4b811 100644
--- a/project/pycompile.mk
+++ b/project/pycompile.mk
@@ -29,16 +29,17 @@ PYCOMPILE_LDFLAGS	+= -lreadline -lm -lutil -lpthread
 $(PYCOMPILE_DIR)/tree.tag:
 		mkdir -p $(PYCOMPILE_DIR)/bin
 		mkdir -p $(PYCOMPILE_DIR)/lib
+		mkdir -p $(PYCOMPILE_DIR)/core
+		mkdir -p $(PYCOMPILE_DIR)/core/Modules
+		mkdir -p $(PYCOMPILE_DIR)/core/Objects
+		mkdir -p $(PYCOMPILE_DIR)/core/Parser
+		mkdir -p $(PYCOMPILE_DIR)/core/Python
 		mkdir -p $(PYCOMPILE_DIR)/pyext
 		mkdir -p $(PYCOMPILE_DIR)/pyext/obj
 		mkdir -p $(PYCOMPILE_DIR)/lib/$(NICKNAME)
 		mkdir -p $(PYCOMPILE_DIR)/lib/$(NICKNAME)/encodings
 		mkdir -p $(PYCOMPILE_DIR)/lib/$(NICKNAME)/lib-dynload
 		mkdir -p $(PYCOMPILE_DIR)/build
-		mkdir -p $(PYCOMPILE_DIR)/Modules
-		mkdir -p $(PYCOMPILE_DIR)/Objects
-		mkdir -p $(PYCOMPILE_DIR)/Parser
-		mkdir -p $(PYCOMPILE_DIR)/Python
 		touch $(PYCOMPILE_DIR)/tree.tag
 
 ifeq ($(PYCOMPILE_CFGSTEP),)
@@ -61,19 +62,11 @@ endif
 $(PYCOMPILE_DIR)/build/config.c:	$(PYCOMPILE_DIR)/config.tag
 $(PYCOMPILE_DIR)/build/pyconfig.h:	$(PYCOMPILE_DIR)/config.tag
 
-$(PYCOMPILE_DIR)/Modules/config.o:	$(PYCOMPILE_DIR)/build/config.c $(ALL_HEADERS) $(PYCOMPILE_TAGS)
+$(PYCOMPILE_DIR)/core/Modules/config.o:	$(PYCOMPILE_DIR)/build/config.c $(ALL_HEADERS) $(PYCOMPILE_TAGS)
 					$(NATIVE_CC) -c -o $@ $< $(PYCOMPILE_CFLAGS)
 
-$(PYCOMPILE_DIR)/Modules/%.o:	$(SOURCE_DIR)/Modules/%.c $(ALL_HEADERS) $(PYCOMPILE_TAGS)
+$(PYCOMPILE_DIR)/core/%.o:	$(SOURCE_DIR)/%.c $(ALL_HEADERS) $(PYCOMPILE_TAGS)
 				$(NATIVE_CC) -c -o $@ $< $(PYCOMPILE_CFLAGS)
-
-$(PYCOMPILE_DIR)/Objects/%.o:	$(SOURCE_DIR)/Objects/%.c $(ALL_HEADERS) $(PYCOMPILE_TAGS)
-				$(NATIVE_CC) -c -o $@ $< $(PYCOMPILE_CFLAGS)
-
-$(PYCOMPILE_DIR)/Parser/%.o:	$(SOURCE_DIR)/Parser/%.c $(ALL_HEADERS) $(PYCOMPILE_TAGS)
-				$(NATIVE_CC) -c -o $@ $< $(PYCOMPILE_CFLAGS)
-
-$(PYCOMPILE_DIR)/Python/%.o:	$(SOURCE_DIR)/Python/%.c $(ALL_HEADERS) $(PYCOMPILE_TAGS)
 				$(NATIVE_CC) -c -o $@ $< $(PYCOMPILE_CFLAGS)
 
 $(PYCOMPILE_DIR)/pyext/obj/%.o:	$(SOURCE_DIR)/Modules/%.c $(ALL_HEADERS) $(PYCOMPILE_TAGS)
@@ -92,23 +85,16 @@ PYCOMPILE_PYEXT_SRCS = \
 	$(PYEXT_UNICODEDATA_SRCS)	\
 
 
-PYCOMPILE_APP_OBJS	= $(PYCOMPILE_APP_SRCS:Modules/%.c=$(PYCOMPILE_DIR)/Modules/%.o)
-PYCOMPILE_CONFIG_OBJS	= $(PYCOMPILE_CONFIG_SRCS:Modules/%.c=$(PYCOMPILE_DIR)/Modules/%.o)
-PYCOMPILE_MODULE_OBJS	= $(MODULE_SRCS:Modules/%.c=$(PYCOMPILE_DIR)/Modules/%.o)
-PYCOMPILE_OBJECT_OBJS	= $(OBJECT_SRCS:Objects/%.c=$(PYCOMPILE_DIR)/Objects/%.o)
-PYCOMPILE_PARSER_OBJS	= $(PARSER_SRCS:Parser/%.c=$(PYCOMPILE_DIR)/Parser/%.o)
-PYCOMPILE_PYTHON_OBJS	= $(PYTHON_SRCS:Python/%.c=$(PYCOMPILE_DIR)/Python/%.o)
-PYCOMPILE_PYEXT_OBJS	= $(PYCOMPILE_PYEXT_SRCS:%.c=$(PYCOMPILE_DIR)/%.o)
-
-PYCOMPILE_OBJS = \
-	$(PYCOMPILE_APP_OBJS)		\
-	$(PYCOMPILE_CONFIG_OBJS)	\
-	$(PYCOMPILE_MODULE_OBJS)	\
-	$(PYCOMPILE_OBJECT_OBJS)	\
-	$(PYCOMPILE_PARSER_OBJS)	\
-	$(PYCOMPILE_PYTHON_OBJS)	\
-	$(PYCOMPILE_PYEXT_OBJS)		\
+PYCOMPILE_SRCS =                    \
+	$(PYCOMPILE_APP_SRCS)       \
+	$(PYCOMPILE_CONFIG_SRCS)    \
+	$(PYCOMPILE_PYEXT_SRCS)     \
+	$(MODULE_SRCS)              \
+	$(OBJECT_SRCS)              \
+	$(PARSER_SRCS)              \
+	$(PYTHON_SRCS)
 
+PYCOMPILE_OBJS = $(PYCOMPILE_SRCS:%.c=$(PYCOMPILE_DIR)/%.o)
 
 ifeq ($(PYCOMPILE_CFGSTEP),)
 
-- 
cgit v1.2.3