diff Makefile.gen @ 658:c430112449a7

Move miniJSS into a subdirectory.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 16 Apr 2013 07:32:29 +0300
parents 064c942d342e
children bfad79dc1740
line wrap: on
line diff
--- a/Makefile.gen	Tue Apr 16 07:25:54 2013 +0300
+++ b/Makefile.gen	Tue Apr 16 07:32:29 2013 +0300
@@ -151,8 +151,11 @@
 ###
 ### miniJSS
 ###
+MINIJSS=$(DMLIB)/minijss/
+
+
 ifeq ($(JSS),yes)
-DM_CFLAGS+=-DDM_USE_JSS
+DM_CFLAGS+=-DDM_USE_JSS -I$(MINIJSS)
 
 ifeq ($(JSS_LIGHT),yes)
 DM_CFLAGS+=-DJSS_LIGHT -Os
@@ -188,7 +191,7 @@
 endif
 
 ifeq ($(DM_USE_C),yes)
-TARGETS += $(DMLIB)jmix_c.c
+TARGETS += $(MINIJSS)jmix_c.c
 DMLIB_OBJS+=jmix_c.o
 endif
 
@@ -276,6 +279,15 @@
 	@grep '#\s*include\s*\"' $< | sed 's/#\s*include\s\s*"\(.*\)"/\1/' | while read i; do if test -e "$$i"; then echo "$$i" >> $@; fi; done
 
 
+$(OBJPATH)%.o: $(MINIJSS)%.c $(MINIJSS)%.h
+	@echo " CC $<"
+	@$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS)
+
+$(OBJPATH)%.o: $(MINIJSS)%.c
+	@echo " CC $<"
+	@$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS)
+
+
 $(OBJPATH)%.o: $(DMLIB)tests/%.c $(DMLIB)tests/%.h
 	@echo " CC $<"
 	@$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS)
@@ -316,7 +328,7 @@
 ### dmlib rules
 ###
 
-$(DMLIB)jmix_c.c: $(DMLIB)jmix_c_in.c $(DMLIB)jmixtmpl_c.h $(DMLIB)jmix_post_c.h
+$(MINIJSS)jmix_c.c: $(MINIJSS)jmix_c_in.c $(MINIJSS)jmixtmpl_c.h $(MINIJSS)jmix_post_c.h
 	(echo "#include \"jssmix.h\"" && cpp $< $(DM_CFLAGS)) | sed "s/^# .*//g" > $@
 
 $(OBJPATH)dmimage.o: $(DMLIB)dmimage.c $(DMLIB)stb_image.c $(DMLIB)dmimage.h
@@ -324,15 +336,15 @@
 	@$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS)
 
 
-$(OBJPATH)jssmod.o: $(DMLIB)jssmod.c $(DMLIB)jssmod.h $(DMLIB)jss.h
+$(OBJPATH)jssmod.o: $(MINIJSS)jssmod.c $(MINIJSS)jssmod.h $(MINIJSS)jss.h
 	@echo " CC $+"
 	@$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS)
 
-$(OBJPATH)jssplr.o: $(DMLIB)jssplr.c $(DMLIB)jssplr.h $(DMLIB)jss.h $(DMLIB)jssmod.h $(DMLIB)jssmix.h
+$(OBJPATH)jssplr.o: $(MINIJSS)jssplr.c $(MINIJSS)jssplr.h $(MINIJSS)jss.h $(MINIJSS)jssmod.h $(MINIJSS)jssmix.h
 	@echo " CC $+"
 	@$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS)
 
-$(OBJPATH)jssmix.o: $(DMLIB)jssmix.c $(DMLIB)jssmix.h $(DMLIB)jss.h
+$(OBJPATH)jssmix.o: $(MINIJSS)jssmix.c $(MINIJSS)jssmix.h $(MINIJSS)jss.h
 	@echo " CC $+"
 	@$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS)