From 2f7a8bf9f354b9eed47ed365efc44c0df08cd18e Mon Sep 17 00:00:00 2001 From: tobigun Date: Thu, 11 Sep 2008 10:24:12 +0000 Subject: small change of paths.inc target git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1362 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/Makefile.in | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/Makefile.in b/src/Makefile.in index 110d3fec..33bf8fba 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -220,13 +220,17 @@ SRC_FILES = $(shell find $(srcdir) -name "*.inc" -o -name "*.pas" -o -name "*.pp # execution of this Makefile. # Paths cannot be passed to fpc via -d as with gcc's -D parameter. # We use an intermediate file instead. +# # See [info autoconf], "19.5 How Do I `#define' Installation Directories?" -.PHONY: paths.inc -paths.inc: - echo "INSTALL_DATADIR = '$(INSTALL_DATADIR)';" >$@ +# +# Do NOT use paths.inc as target name as it is in the requisite list +# of $(USDX_BIN). +.PHONY: create-pathinfo +create-pathinfo: + echo "INSTALL_DATADIR = '$(INSTALL_DATADIR)';" > paths.inc # check if any src-file changed and rebuild -$(USDX_BIN): $(RESOURCE_FILE) $(USDX_PROJ) $(STATIC_LIBS) $(INC_FILES) $(PAS_FILES) paths.inc +$(USDX_BIN): $(RESOURCE_FILE) $(USDX_PROJ) $(STATIC_LIBS) $(SRC_FILES) @echo "===================================" @echo "Changed files:" @echo "$?" @@ -239,7 +243,7 @@ $(USDX_BIN): $(RESOURCE_FILE) $(USDX_PROJ) $(STATIC_LIBS) $(INC_FILES) $(PAS_FIL @echo "-----------------------------------" $(MKDIR) "$(PCUNIT_DIR)" - $(MAKE) paths.inc + $(MAKE) create-pathinfo $(PPC) $(strip $(PFLAGS_ALL)) -o$@ $(USDX_PROJ) ################################################# -- cgit v1.2.3