Browse Source

* Use fpc_cleanall instead of fpc_distclean on a make distclean when no fpmake-binary is available. Because fpc_cleanall could be an empty target

git-svn-id: trunk@18128 -
joost 14 years ago
parent
commit
3b30ec8c7c

+ 1 - 1
packages/fastcgi/Makefile

@@ -2232,7 +2232,7 @@ clean:
 	$(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
 	$(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
 endif
 endif
 ifeq ($(FPMAKE_BIN_CLEAN),)
 ifeq ($(FPMAKE_BIN_CLEAN),)
-distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_distclean
+distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall
 else
 else
 distclean:	
 distclean:	
 ifdef inUnix
 ifdef inUnix

+ 1 - 1
packages/fastcgi/Makefile.fpc

@@ -48,7 +48,7 @@ endif
 # In case of a distclean, perform an 'old'-style distclean. This to avoid problems
 # In case of a distclean, perform an 'old'-style distclean. This to avoid problems
 # when the package is compiled using fpcmake prior to running this clean using fpmake
 # when the package is compiled using fpcmake prior to running this clean using fpmake
 ifeq ($(FPMAKE_BIN_CLEAN),)
 ifeq ($(FPMAKE_BIN_CLEAN),)
-distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_distclean
+distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall
 else
 else
 distclean:	
 distclean:	
 ifdef inUnix
 ifdef inUnix

+ 1 - 1
packages/fcl-async/Makefile

@@ -2232,7 +2232,7 @@ clean:
 	$(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
 	$(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
 endif
 endif
 ifeq ($(FPMAKE_BIN_CLEAN),)
 ifeq ($(FPMAKE_BIN_CLEAN),)
-distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_distclean
+distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall
 else
 else
 distclean:	
 distclean:	
 ifdef inUnix
 ifdef inUnix

+ 1 - 1
packages/fcl-async/Makefile.fpc

@@ -48,7 +48,7 @@ endif
 # In case of a distclean, perform an 'old'-style distclean. This to avoid problems
 # In case of a distclean, perform an 'old'-style distclean. This to avoid problems
 # when the package is compiled using fpcmake prior to running this clean using fpmake
 # when the package is compiled using fpcmake prior to running this clean using fpmake
 ifeq ($(FPMAKE_BIN_CLEAN),)
 ifeq ($(FPMAKE_BIN_CLEAN),)
-distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_distclean
+distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall
 else
 else
 distclean:	
 distclean:	
 ifdef inUnix
 ifdef inUnix

+ 1 - 1
packages/fcl-base/Makefile

@@ -2232,7 +2232,7 @@ clean:
 	$(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
 	$(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
 endif
 endif
 ifeq ($(FPMAKE_BIN_CLEAN),)
 ifeq ($(FPMAKE_BIN_CLEAN),)
-distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_distclean
+distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall
 else
 else
 distclean:	
 distclean:	
 ifdef inUnix
 ifdef inUnix

+ 1 - 1
packages/fcl-base/Makefile.fpc

@@ -48,7 +48,7 @@ endif
 # In case of a distclean, perform an 'old'-style distclean. This to avoid problems
 # In case of a distclean, perform an 'old'-style distclean. This to avoid problems
 # when the package is compiled using fpcmake prior to running this clean using fpmake
 # when the package is compiled using fpcmake prior to running this clean using fpmake
 ifeq ($(FPMAKE_BIN_CLEAN),)
 ifeq ($(FPMAKE_BIN_CLEAN),)
-distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_distclean
+distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall
 else
 else
 distclean:	
 distclean:	
 ifdef inUnix
 ifdef inUnix

+ 1 - 1
packages/fcl-extra/Makefile

@@ -2232,7 +2232,7 @@ clean:
 	$(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
 	$(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
 endif
 endif
 ifeq ($(FPMAKE_BIN_CLEAN),)
 ifeq ($(FPMAKE_BIN_CLEAN),)
-distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_distclean
+distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall
 else
 else
 distclean:	
 distclean:	
 ifdef inUnix
 ifdef inUnix

+ 1 - 1
packages/fcl-extra/Makefile.fpc

@@ -48,7 +48,7 @@ endif
 # In case of a distclean, perform an 'old'-style distclean. This to avoid problems
 # In case of a distclean, perform an 'old'-style distclean. This to avoid problems
 # when the package is compiled using fpcmake prior to running this clean using fpmake
 # when the package is compiled using fpcmake prior to running this clean using fpmake
 ifeq ($(FPMAKE_BIN_CLEAN),)
 ifeq ($(FPMAKE_BIN_CLEAN),)
-distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_distclean
+distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall
 else
 else
 distclean:	
 distclean:	
 ifdef inUnix
 ifdef inUnix

+ 1 - 1
packages/fcl-js/Makefile

@@ -2232,7 +2232,7 @@ clean:
 	$(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
 	$(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
 endif
 endif
 ifeq ($(FPMAKE_BIN_CLEAN),)
 ifeq ($(FPMAKE_BIN_CLEAN),)
-distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_distclean
+distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall
 else
 else
 distclean:	
 distclean:	
 ifdef inUnix
 ifdef inUnix

+ 1 - 1
packages/fcl-js/Makefile.fpc

@@ -48,7 +48,7 @@ endif
 # In case of a distclean, perform an 'old'-style distclean. This to avoid problems
 # In case of a distclean, perform an 'old'-style distclean. This to avoid problems
 # when the package is compiled using fpcmake prior to running this clean using fpmake
 # when the package is compiled using fpcmake prior to running this clean using fpmake
 ifeq ($(FPMAKE_BIN_CLEAN),)
 ifeq ($(FPMAKE_BIN_CLEAN),)
-distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_distclean
+distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall
 else
 else
 distclean:	
 distclean:	
 ifdef inUnix
 ifdef inUnix

+ 1 - 1
packages/fcl-json/Makefile

@@ -2232,7 +2232,7 @@ clean:
 	$(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
 	$(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
 endif
 endif
 ifeq ($(FPMAKE_BIN_CLEAN),)
 ifeq ($(FPMAKE_BIN_CLEAN),)
-distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_distclean
+distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall
 else
 else
 distclean:	
 distclean:	
 ifdef inUnix
 ifdef inUnix

+ 1 - 1
packages/fcl-json/Makefile.fpc

@@ -48,7 +48,7 @@ endif
 # In case of a distclean, perform an 'old'-style distclean. This to avoid problems
 # In case of a distclean, perform an 'old'-style distclean. This to avoid problems
 # when the package is compiled using fpcmake prior to running this clean using fpmake
 # when the package is compiled using fpcmake prior to running this clean using fpmake
 ifeq ($(FPMAKE_BIN_CLEAN),)
 ifeq ($(FPMAKE_BIN_CLEAN),)
-distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_distclean
+distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall
 else
 else
 distclean:	
 distclean:	
 ifdef inUnix
 ifdef inUnix

+ 1 - 1
packages/fcl-net/Makefile

@@ -2232,7 +2232,7 @@ clean:
 	$(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
 	$(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
 endif
 endif
 ifeq ($(FPMAKE_BIN_CLEAN),)
 ifeq ($(FPMAKE_BIN_CLEAN),)
-distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_distclean
+distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall
 else
 else
 distclean:	
 distclean:	
 ifdef inUnix
 ifdef inUnix

+ 1 - 1
packages/fcl-net/Makefile.fpc

@@ -48,7 +48,7 @@ endif
 # In case of a distclean, perform an 'old'-style distclean. This to avoid problems
 # In case of a distclean, perform an 'old'-style distclean. This to avoid problems
 # when the package is compiled using fpcmake prior to running this clean using fpmake
 # when the package is compiled using fpcmake prior to running this clean using fpmake
 ifeq ($(FPMAKE_BIN_CLEAN),)
 ifeq ($(FPMAKE_BIN_CLEAN),)
-distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_distclean
+distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall
 else
 else
 distclean:	
 distclean:	
 ifdef inUnix
 ifdef inUnix

+ 1 - 1
packages/fcl-passrc/Makefile

@@ -2232,7 +2232,7 @@ clean:
 	$(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
 	$(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
 endif
 endif
 ifeq ($(FPMAKE_BIN_CLEAN),)
 ifeq ($(FPMAKE_BIN_CLEAN),)
-distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_distclean
+distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall
 else
 else
 distclean:	
 distclean:	
 ifdef inUnix
 ifdef inUnix

+ 1 - 1
packages/fcl-passrc/Makefile.fpc

@@ -48,7 +48,7 @@ endif
 # In case of a distclean, perform an 'old'-style distclean. This to avoid problems
 # In case of a distclean, perform an 'old'-style distclean. This to avoid problems
 # when the package is compiled using fpcmake prior to running this clean using fpmake
 # when the package is compiled using fpcmake prior to running this clean using fpmake
 ifeq ($(FPMAKE_BIN_CLEAN),)
 ifeq ($(FPMAKE_BIN_CLEAN),)
-distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_distclean
+distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall
 else
 else
 distclean:	
 distclean:	
 ifdef inUnix
 ifdef inUnix

+ 1 - 1
packages/fcl-registry/Makefile

@@ -2232,7 +2232,7 @@ clean:
 	$(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
 	$(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
 endif
 endif
 ifeq ($(FPMAKE_BIN_CLEAN),)
 ifeq ($(FPMAKE_BIN_CLEAN),)
-distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_distclean
+distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall
 else
 else
 distclean:	
 distclean:	
 ifdef inUnix
 ifdef inUnix

+ 1 - 1
packages/fcl-registry/Makefile.fpc

@@ -48,7 +48,7 @@ endif
 # In case of a distclean, perform an 'old'-style distclean. This to avoid problems
 # In case of a distclean, perform an 'old'-style distclean. This to avoid problems
 # when the package is compiled using fpcmake prior to running this clean using fpmake
 # when the package is compiled using fpcmake prior to running this clean using fpmake
 ifeq ($(FPMAKE_BIN_CLEAN),)
 ifeq ($(FPMAKE_BIN_CLEAN),)
-distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_distclean
+distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall
 else
 else
 distclean:	
 distclean:	
 ifdef inUnix
 ifdef inUnix

+ 1 - 1
packages/fcl-res/Makefile

@@ -2232,7 +2232,7 @@ clean:
 	$(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
 	$(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
 endif
 endif
 ifeq ($(FPMAKE_BIN_CLEAN),)
 ifeq ($(FPMAKE_BIN_CLEAN),)
-distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_distclean
+distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall
 else
 else
 distclean:	
 distclean:	
 ifdef inUnix
 ifdef inUnix

+ 1 - 1
packages/fcl-res/Makefile.fpc

@@ -48,7 +48,7 @@ endif
 # In case of a distclean, perform an 'old'-style distclean. This to avoid problems
 # In case of a distclean, perform an 'old'-style distclean. This to avoid problems
 # when the package is compiled using fpcmake prior to running this clean using fpmake
 # when the package is compiled using fpcmake prior to running this clean using fpmake
 ifeq ($(FPMAKE_BIN_CLEAN),)
 ifeq ($(FPMAKE_BIN_CLEAN),)
-distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_distclean
+distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall
 else
 else
 distclean:	
 distclean:	
 ifdef inUnix
 ifdef inUnix

+ 1 - 1
packages/fcl-web/Makefile

@@ -2232,7 +2232,7 @@ clean:
 	$(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
 	$(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
 endif
 endif
 ifeq ($(FPMAKE_BIN_CLEAN),)
 ifeq ($(FPMAKE_BIN_CLEAN),)
-distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_distclean
+distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall
 else
 else
 distclean:	
 distclean:	
 ifdef inUnix
 ifdef inUnix

+ 1 - 1
packages/fcl-web/Makefile.fpc

@@ -48,7 +48,7 @@ endif
 # In case of a distclean, perform an 'old'-style distclean. This to avoid problems
 # In case of a distclean, perform an 'old'-style distclean. This to avoid problems
 # when the package is compiled using fpcmake prior to running this clean using fpmake
 # when the package is compiled using fpcmake prior to running this clean using fpmake
 ifeq ($(FPMAKE_BIN_CLEAN),)
 ifeq ($(FPMAKE_BIN_CLEAN),)
-distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_distclean
+distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall
 else
 else
 distclean:	
 distclean:	
 ifdef inUnix
 ifdef inUnix