[fU-cvs] libfunutil/toc/make qmake2make.make,1.19,1.20

[<sg...@us...>]

Update of /cvsroot/libfunutil/libfunutil/toc/make
In directory sc8-pr-cvs1:/tmp/cvs-serv22290

Modified Files:
	qmake2make.make 
Log Message:
fixed some brain-dead target-propogation bugs caused when i (partially) replaced the eval-related code with non-eval equivalents (and left out a huge part, apparently).

Index: qmake2make.make
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/make/qmake2make.make,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- qmake2make.make	5 Sep 2003 09:30:19 -0000	1.19
+++ qmake2make.make	9 Dec 2003 21:22:48 -0000	1.20
@@ -14,12 +14,12 @@
 # to call the appropriate targets in the qmake-processed files.
 
 
-QMAKE_QMAKE2MAKE_MAKE = $(toc_makesdir)/qmake2make.make
+QMAKE_QMAKE2MAKE_MAKE = $(TOC_MAKESDIR)/qmake2make.make
 ifeq (,$(wildcard $(QTDIR)))
 $(error $(QMAKE_QMAKE2MAKE_MAKE) requires the QTDIR var. Maybe you need to run the qt test?)
 endif
 ifeq (,$(DEPSGEN_BIN))
-include $(toc_makesdir)/deps.make
+include $(TOC_MAKESDIR)/deps.make
 endif
 
 MAKE_NO_PRINT_DIR = ${MAKE} --no-print-directory
@@ -45,10 +45,11 @@
 	@test -f "$<" || exit 0; \
 	cmd="$(QMAKE) -o $@ $*$(QMAKEFILE_SUFFIX)"; echo $$cmd; $$cmd
 	@echo "Collecting source dependencies for $@... "; \
-	getter=$(toc_tocdir)/bin/getMakefileVar; \
+	getter=$(TOC_HOME)/bin/getMakefileVar; \
+	QTDIR=$(QTDIR); \
 	sources=$$($$getter SOURCES $@); \
-		mocs=$$($$getter SRCMOC $@); \
-		includes=$$($$getter INCPATH $@ | sed -e 's|$$(QTDIR)|$(QTDIR)|g'); \
+	mocs=$$($$getter SRCMOC $@); \
+	includes=$$($$getter INCPATH $@ | sed -e 's|$$(QTDIR)|$(QTDIR)|g'); \
 	test -z "$$sources" -a -z "$$includes" && exit 0; \
 	test -z "$$mocs" || { \
 		echo "Generating moc files... ";\
@@ -66,14 +67,14 @@
 deps: $(QMAKED_MAKEFILES)
 
 # create targets for qmake-MAKEFILE-TARGET:
-QMAKE_TARGETS_TO_PROPOGATE = first all install uninstall clean distclean staticlib mocables
+# QMAKE_TARGETS_TO_PROPOGATE = first all install uninstall clean distclean staticlib mocables
 
 # simplified version, for compatibility with make 3.79.1 :(
 # note that i cannot make it depend on make.% because then it fucks up, refusing to accept targets
 # in the form qmake-X-Y.
 # i HATE that i can't use the $(eval) code, but make 3.79 (without
 # $(eval)) is common and it needs to be supported.
-qmake-%:
+qmake-%:# expects qmake-MAKEFILE_BASE_NAME_-TARGET, e.g. qmake-myproject-all
 	@t=$*; head=$${t%%-*}; tail=$${t##*-}; \
 	mf=$(GNUMAKEFILE_PREFIX)$$head; \
 	test "$$head" = "$$tail" && tail=all; \
@@ -85,12 +86,16 @@
 # tie in to the standard targets:
 install: $(patsubst %,qmake-%-install,$(QMAKES))
 uninstall: $(patsubst %,qmake-%-uninstall,$(QMAKES))
+first: $(patsubst %,qmake-%-first,$(QMAKES))
+clean: $(patsubst %,qmake-%-clean,$(QMAKES))
+distclean: $(patsubst %,qmake-%-distclean,$(QMAKES))
+staticlib: $(patsubst %,qmake-%-staticlib,$(QMAKES))
+mocables: $(patsubst %,qmake-%-mocables,$(QMAKES))
 
-QMAKE_CLEANS = $(patsubst %,qmake-%-clean,$(QMAKES))
-QMAKE_DISTCLEANS = $(patsubst %,qmake-%-distclean,$(QMAKES))
-clean-.: $(QMAKE_CLEANS)
-distclean-.: $(QMAKE_DISTCLEANS)
+CLEAN_FILES += $(patsubst %,qmake-%-clean,$(QMAKES))
+DISTCLEAN_FILES = $(patsubst %,qmake-%-distclean,$(QMAKES))
 
 qmake: $(patsubst %,qmake-%,$(QMAKES))
+
 DISTCLEAN_FILES += $(QMAKED_MAKEFILES)
 # ^^^ these /should/ be CLEAN_FILES, but that causes a lot of unneeded file rebuilding.