* remove require fcl (merged)

fcl/db/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/09/01]
+# Makefile generated by fpcmake v1.00 [2000/09/02]
 #
 
 defaultrule: all
@@ -208,7 +208,7 @@ endif
 
 # Packages
 
-override PACKAGES+=rtl fcl mysql
+override PACKAGES+=rtl mysql
 
 # Libraries
 
@@ -503,7 +503,6 @@ endif
 # PACKAGESDIR packages
 
 PACKAGERTL=1
-PACKAGEFCL=1
 PACKAGEMYSQL=1
 
 ifdef PACKAGERTL
@@ -535,35 +534,6 @@ ifdef UNITDIR_RTL
 override NEEDUNITDIR+=$(UNITDIR_RTL)
 endif
 endif
-ifdef PACKAGEFCL
-ifneq ($(wildcard $(FPCDIR)/fcl),)
-ifneq ($(wildcard $(FPCDIR)/fcl/$(OS_TARGET)),)
-PACKAGEDIR_FCL=$(FPCDIR)/fcl/$(OS_TARGET)
-else
-PACKAGEDIR_FCL=$(FPCDIR)/fcl
-endif
-ifeq ($(wildcard $(PACKAGEDIR_FCL)/$(FPCMADE)),)
-override COMPILEPACKAGES+=package_fcl
-package_fcl:
-	$(MAKE) -C $(PACKAGEDIR_FCL) all
-endif
-UNITDIR_FCL=$(PACKAGEDIR_FCL)
-else
-PACKAGEDIR_FCL=
-ifneq ($(wildcard $(UNITSDIR)/fcl),)
-ifneq ($(wildcard $(UNITSDIR)/fcl/$(OS_TARGET)),)
-UNITDIR_FCL=$(UNITSDIR)/fcl/$(OS_TARGET)
-else
-UNITDIR_FCL=$(UNITSDIR)/fcl
-endif
-else
-UNITDIR_FCL=
-endif
-endif
-ifdef UNITDIR_FCL
-override NEEDUNITDIR+=$(UNITDIR_FCL)
-endif
-endif
 ifdef PACKAGEMYSQL
 ifneq ($(wildcard $(PACKAGESDIR)/mysql),)
 ifneq ($(wildcard $(PACKAGESDIR)/mysql/$(OS_TARGET)),)
@@ -1214,7 +1184,7 @@ fpc_distclean: fpc_clean
 # Also run clean first if targetdir is set. Unittargetdir is always
 # set if targetdir or unittargetdir is specified
 ifdef UNITTARGETDIR
-TARGETDIRCLEAN=clean
+TARGETDIRCLEAN=fpc_clean
 endif
 
 fpc_cleanall: $(CLEANTARGET) $(TARGETDIRCLEAN)

fcl/db/Makefile.fpc

@@ -8,7 +8,7 @@ examples=testds createds mtest tested
 
 [require]
 options=-S2
-packages=fcl mysql
+packages=mysql
 
 [install]
 unitsubdir=fcl

fcl/shedit/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/09/01]
+# Makefile generated by fpcmake v1.00 [2000/09/02]
 #
 
 defaultrule: all
@@ -207,7 +207,7 @@ endif
 
 # Packages
 
-override PACKAGES+=rtl fcl
+override PACKAGES+=rtl
 
 # Libraries
 
@@ -502,7 +502,6 @@ endif
 # PACKAGESDIR packages
 
 PACKAGERTL=1
-PACKAGEFCL=1
 
 ifdef PACKAGERTL
 ifneq ($(wildcard $(FPCDIR)/rtl),)
@@ -533,35 +532,6 @@ ifdef UNITDIR_RTL
 override NEEDUNITDIR+=$(UNITDIR_RTL)
 endif
 endif
-ifdef PACKAGEFCL
-ifneq ($(wildcard $(FPCDIR)/fcl),)
-ifneq ($(wildcard $(FPCDIR)/fcl/$(OS_TARGET)),)
-PACKAGEDIR_FCL=$(FPCDIR)/fcl/$(OS_TARGET)
-else
-PACKAGEDIR_FCL=$(FPCDIR)/fcl
-endif
-ifeq ($(wildcard $(PACKAGEDIR_FCL)/$(FPCMADE)),)
-override COMPILEPACKAGES+=package_fcl
-package_fcl:
-	$(MAKE) -C $(PACKAGEDIR_FCL) all
-endif
-UNITDIR_FCL=$(PACKAGEDIR_FCL)
-else
-PACKAGEDIR_FCL=
-ifneq ($(wildcard $(UNITSDIR)/fcl),)
-ifneq ($(wildcard $(UNITSDIR)/fcl/$(OS_TARGET)),)
-UNITDIR_FCL=$(UNITSDIR)/fcl/$(OS_TARGET)
-else
-UNITDIR_FCL=$(UNITSDIR)/fcl
-endif
-else
-UNITDIR_FCL=
-endif
-endif
-ifdef UNITDIR_FCL
-override NEEDUNITDIR+=$(UNITDIR_FCL)
-endif
-endif
 
 
 #####################################################################
@@ -1161,7 +1131,7 @@ fpc_distclean: fpc_clean
 # Also run clean first if targetdir is set. Unittargetdir is always
 # set if targetdir or unittargetdir is specified
 ifdef UNITTARGETDIR
-TARGETDIRCLEAN=clean
+TARGETDIRCLEAN=fpc_clean
 endif
 
 fpc_cleanall: $(CLEANTARGET) $(TARGETDIRCLEAN)

fcl/shedit/Makefile.fpc

@@ -7,7 +7,6 @@ units=doc_text shedit sh_xml sh_pas
 
 [require]
 options=-S2
-packages=fcl
 
 [install]
 unitsubdir=fcl

fcl/xml/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/09/01]
+# Makefile generated by fpcmake v1.00 [2000/09/02]
 #
 
 defaultrule: all
@@ -207,7 +207,7 @@ endif
 
 # Packages
 
-override PACKAGES+=rtl fcl
+override PACKAGES+=rtl
 
 # Libraries
 
@@ -502,7 +502,6 @@ endif
 # PACKAGESDIR packages
 
 PACKAGERTL=1
-PACKAGEFCL=1
 
 ifdef PACKAGERTL
 ifneq ($(wildcard $(FPCDIR)/rtl),)
@@ -533,35 +532,6 @@ ifdef UNITDIR_RTL
 override NEEDUNITDIR+=$(UNITDIR_RTL)
 endif
 endif
-ifdef PACKAGEFCL
-ifneq ($(wildcard $(FPCDIR)/fcl),)
-ifneq ($(wildcard $(FPCDIR)/fcl/$(OS_TARGET)),)
-PACKAGEDIR_FCL=$(FPCDIR)/fcl/$(OS_TARGET)
-else
-PACKAGEDIR_FCL=$(FPCDIR)/fcl
-endif
-ifeq ($(wildcard $(PACKAGEDIR_FCL)/$(FPCMADE)),)
-override COMPILEPACKAGES+=package_fcl
-package_fcl:
-	$(MAKE) -C $(PACKAGEDIR_FCL) all
-endif
-UNITDIR_FCL=$(PACKAGEDIR_FCL)
-else
-PACKAGEDIR_FCL=
-ifneq ($(wildcard $(UNITSDIR)/fcl),)
-ifneq ($(wildcard $(UNITSDIR)/fcl/$(OS_TARGET)),)
-UNITDIR_FCL=$(UNITSDIR)/fcl/$(OS_TARGET)
-else
-UNITDIR_FCL=$(UNITSDIR)/fcl
-endif
-else
-UNITDIR_FCL=
-endif
-endif
-ifdef UNITDIR_FCL
-override NEEDUNITDIR+=$(UNITDIR_FCL)
-endif
-endif
 
 
 #####################################################################
@@ -1161,7 +1131,7 @@ fpc_distclean: fpc_clean
 # Also run clean first if targetdir is set. Unittargetdir is always
 # set if targetdir or unittargetdir is specified
 ifdef UNITTARGETDIR
-TARGETDIRCLEAN=clean
+TARGETDIRCLEAN=fpc_clean
 endif
 
 fpc_cleanall: $(CLEANTARGET) $(TARGETDIRCLEAN)

fcl/xml/Makefile.fpc

@@ -7,7 +7,6 @@ units=dom htmldoc xmlcfg xmlread xmlstreaming xmlwrite
 
 [require]
 options=-S2
-packages=fcl
 
 [install]
 unitsubdir=fcl