Index: makefile.mk
===================================================================
RCS file: /cvs/udk/product/util/makefile.mk,v
retrieving revision 1.66.12.1.8.3
diff -u -3 -p -r1.66.12.1.8.3 makefile.mk
--- makefile.mk	9 Feb 2003 18:20:10 -0000	1.66.12.1.8.3
+++ makefile.mk	18 Feb 2003 15:33:42 -0000
@@ -298,6 +298,7 @@ DIRLIST = \
 	$(DESTDIRXML)       \
 	$(DESTDIRINC)       \
 	$(DESTDIRSETTINGS)  \
+	$(DESTDIREXAMPLES)  \
 	$(DESTDIREXAMPLESCPP)   \
 	$(DESTDIREXAMPLESCPP)$/remoteclient \
 	$(DESTDIREXAMPLESCPP)$/counter      \
@@ -428,32 +429,17 @@ ADDITIONALFILELIST= \
 # TARGETS
 #--------------------------------------------------
 ALLTARGETS = \
-	$(MISC)$/deltree.txt 	\
-	$(DIRLIST) 		\
 	$(FILELIST)
 
 .IF "$(GUI)"=="WNT"
 ALLTARGETS+= \
-    $(BIN)$/$(ODK_PARTZIPFILE)
-.ELSE
-ALLTARGETS+= \
-    $(BIN)$/$(ODK_PARTTARGZFILE)
-.ENDIF
-    
-.IF "$(BUILD_SOSL)"!=""
-#for OpenOffice build additionally a complete UDK
-ALLTARGETS+= \
-	$(ADDITIONALFILELIST)
-.ENDIF
-
-.IF "$(GUI)"=="WNT"
-ALLTARGETS+= \
+    $(BIN)$/$(ODK_PARTZIPFILE) \
     $(BIN)$/$(PRODUCTZIPFILE)
 .ELSE
 ALLTARGETS+= \
+    $(BIN)$/$(ODK_PARTTARGZFILE) \
     $(BIN)$/$(PRODUCTTARGZFILE)
 .ENDIF
-
     
 all: \
     $(ALLTARGETS) 
@@ -468,25 +454,29 @@ $(MISC)$/deltree.txt : deltree.txt
 $(DIRLIST) : $(MISC)$/deltree.txt
 	$(MKDIRHIER)	$@
 
-$(DESTDIRBIN)$/udkapi.rdb : $(BINOUT)$/udkapi.rdb
+$(DESTDIRBIN)$/udkapi.rdb : $(BINOUT)$/udkapi.rdb $(DESTDIRBIN)
 	$(GNUCOPY) -p $(BINOUT)$/udkapi.rdb $@
 
+$(FILELIST) : $(DIRLIST)
+
+$(ADDITIONALFILELIST) : $(DIRLIST)
+
 .IF "$(STLPORTDEST)" != ""
 #OOo build environment
 $(STLPORTDEST) : $(STLPORTOUT)
- 	$(GNUCOPY) -p $(STLPORTOUT) $@
+	$(GNUCOPY) -p $(STLPORTOUT) $@
 .ENDIF
 
-$(DESTDIRBIN)$/%$(EXEPOSTFIX) : $(BINOUT)$/%$(EXEPOSTFIX) $(DIRLIST)
+$(DESTDIRBIN)$/%$(EXEPOSTFIX) : $(BINOUT)$/%$(EXEPOSTFIX) $(DESTDIRBIN)
 	$(GNUCOPY) -p $(BINOUT)$/$(@:f) $@
 
-$(DESTDIRDLL)$/%$(MY_DLLPOSTFIX) : $(DLLOUT)$/%$(MY_DLLPOSTFIX) $(DIRLIST)
+$(DESTDIRDLL)$/%$(MY_DLLPOSTFIX) : $(DLLOUT)$/%$(MY_DLLPOSTFIX) $(DESTDIRDLL)
 	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
 
-$(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) : $(DLLOUT)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
+$(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) : $(DLLOUT)$/%$(MY_VERSION_DLLPOSTFIX) $(DESTDIRDLL)
 	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
 
-$(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
+$(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DESTDIRDLL)
 	-rm -f $@
 	-rm -f $(@:db)
 	+ln -s $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@
@@ -502,11 +492,11 @@ $(DLLOUT)$/libstdc++.so.$(LIBSTDCPP3) :
        $(GCCINSTLIB) libstdc++.so.$(LIBSTDCPP3) $(DLLOUT)
 
 # Otherwise you get circular dependencies
-$(DESTDIRDLL)$/libstdc++.so.$(LIBSTDCPP3) : $(DLLOUT)$/libstdc++.so.$(LIBSTDCPP3) $(DIRLIST)
+$(DESTDIRDLL)$/libstdc++.so.$(LIBSTDCPP3) : $(DLLOUT)$/libstdc++.so.$(LIBSTDCPP3) $(DESTDIRDLL)
        -rm -f $@
        $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.$(LIBSTDCPP3) $@
 
-$(DESTDIRDLL)$/libstdc++.so.$(SHORTSTDCPP3) : $(DESTDIRDLL)$/libstdc++.so.$(LIBSTDCPP3) $(DIRLIST)
+$(DESTDIRDLL)$/libstdc++.so.$(SHORTSTDCPP3) : $(DESTDIRDLL)$/libstdc++.so.$(LIBSTDCPP3) $(DESTDIRDLL)
        -rm -f $@
        +ln -s libstdc++.so.$(LIBSTDCPP3) $@
 .ENDIF
@@ -514,46 +504,48 @@ $(DESTDIRDLL)$/libstdc++.so.$(SHORTSTDCP
 $(DLLOUT)$/libgcc_s.so.1 :
        $(GCCINSTLIB) libgcc_s.so.1 $(DLLOUT)
 
-$(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
+$(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DESTDIRDLL)
 	-rm -f $@
 	$(GNUCOPY) -p $(DLLOUT)$/libgcc_s.so.1 $@
 
-$(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
+$(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DESTDIRDLL)
 	-rm -f $@
 	+ln -s libgcc_s.so.1 $@
 #-------------------------------------------------------------
 
-$(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
+$(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DESTDIRJAR)
 	$(GNUCOPY) -p $(BINOUT)$/$(@:f) $@
 
-$(DESTDIRXML)$/%.xml : $(XMLOUT)$/%.xml $(DIRLIST)
-	$(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $? $(MY_TEXTCOPY_TARGETPRE) $@
+$(DESTDIRXML)$/%.xml : $(XMLOUT)$/%.xml $(DESTDIRXML)
+	$(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(XMLOUT)$/$(@:f) $(MY_TEXTCOPY_TARGETPRE) $@
 
-$(DESTDIRXML)$/module-description.dtd : $(XMLOUT)$/module-description.dtd $(DIRLIST)
+$(DESTDIRXML)$/module-description.dtd : $(XMLOUT)$/module-description.dtd $(DESTDIRXML)
 	$(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(XMLOUT)$/module-description.dtd $(MY_TEXTCOPY_TARGETPRE) $@
 
-$(DESTDIRLIB)$/%.lib : $(LIBOUT)$/%.lib $(DIRLIST)
+$(DESTDIRLIB)$/%.lib : $(LIBOUT)$/%.lib $(DESTDIRLIB)
 	$(GNUCOPY) -p $(LIBOUT)$/$(@:f) $@
 
-$(DESTDIRSETTINGS)$/%.mk : $(PRJ)$/settings$/%.mk $(DIRLIST)
+$(DESTDIRSETTINGS)$/%.mk : $(PRJ)$/settings$/%.mk $(DESTDIRSETTINGS)
 	+-rm -f $@ >& $(NULLDEV)
-	$(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $? $(MY_TEXTCOPY_TARGETPRE) $@
+	$(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)$/settings$/$(@:f) $(MY_TEXTCOPY_TARGETPRE) $@
 
 # EXAMPLES CPP RULE
-$(DESTDIREXAMPLESCPP)$/% : $(PRJ)$/examples$/cpp$/% 
+$(DESTDIREXAMPLESCPP)$/% : $(PRJ)$/examples$/cpp$/% $(DESTDIREXAMPLESCPP)
 	+-rm -f $@ >& $(NULLDEV)
-	$(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $? $(MY_TEXTCOPY_TARGETPRE) $@
+	$(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) \
+	  $(subst,$(DESTDIREXAMPLESCPP),$(PRJ)$/examples$/cpp $@) $(MY_TEXTCOPY_TARGETPRE) $@
 
-$(DESTDIREXAMPLES)$/README : $(PRJ)$/examples$/README
+$(DESTDIREXAMPLES)$/README : $(PRJ)$/examples$/README $(DESTDIREXAMPLES)
 	$(GNUCOPY) -p $(PRJ)$/examples$/README $@
 
-$(DESTDIRIDL)$/% : $(IDLOUT)$/%
+$(DESTDIRIDL)$/% : $(IDLOUT)$/% $(DESTDIRIDL)
 	+-rm -f $@
-	$(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $? $(MY_TEXTCOPY_TARGETPRE) $@
+	$(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) \
+	  $(subst,$(DESTDIRIDL),$(IDLOUT) $@) $(MY_TEXTCOPY_TARGETPRE) $@
 
-$(DESTDIRINC)$/% : $(INCOUT)$/%
+$(DESTDIRINC)$/% : $(INCOUT)$/% $(DESTDIRINC)
 	+-rm -f $@
-	$(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $? $(MY_TEXTCOPY_TARGETPRE) $@
+	$(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(subst,$(DESTDIRINC),$(INCOUT) $@) $(MY_TEXTCOPY_TARGETPRE) $@
 
 # ------------------------------------------------------------------------------------
 #      ZIP IT
@@ -567,12 +559,12 @@ $(BIN)$/$(ODK_PARTTARGZFILE) : $(DIRLIST
 	+-$(MY_DELETE_RECURSIVE) $(ADDITIONALFILELIST) >& $(NULLDEV)
 	+-$(RM) $@
 	+cd $(DESTDIR)$/.. && tar cvf - $(PRODUCT_NAME) | gzip -c > $(ODK_PARTTARGZFILE)
-    
-$(BIN)$/$(PRODUCTZIPFILE) : $(BIN)$/$(ODK_PARTZIPFILE) $(ADDITIONALFILELIST)
+
+$(BIN)$/$(PRODUCTZIPFILE) .SEQUENTIAL : $(BIN)$/$(ODK_PARTZIPFILE) $(ADDITIONALFILELIST)
 	+-$(RM) $@
 	+cd $(DESTDIR)$/.. && zip -9 -r $(PRODUCTZIPFILE) $(PRODUCT_NAME)
 
-$(BIN)$/$(PRODUCTTARGZFILE) : $(BIN)$/$(ODK_PARTTARGZFILE) $(ADDITIONALFILELIST)
+$(BIN)$/$(PRODUCTTARGZFILE) .SEQUENTIAL : $(BIN)$/$(ODK_PARTTARGZFILE) $(ADDITIONALFILELIST)
 	+-$(RM) $@
 	+cd $(DESTDIR)$/.. && tar cvf - $(PRODUCT_NAME) | gzip -c > $(PRODUCTTARGZFILE)