Răsfoiți Sursa

* fixed dependency cycle with xmlreg

peter 21 ani în urmă
părinte
comite
39fd362d87
2 a modificat fișierele cu 6 adăugiri și 5 ștergeri
  1. 2 2
      fcl/Makefile
  2. 4 3
      fcl/Makefile.fpc

+ 2 - 2
fcl/Makefile

@@ -225,7 +225,7 @@ ifneq ($(findstring 1.0.,$(FPC_VERSION)),)
 CLASSES10=classes
 endif
 override TARGET_DIRS+=xml image db shedit passrc net
-override TARGET_UNITS+=$(CLASSES10) contnrs inifiles ezcgi pipes rtfpars idea base64 gettext iostream zstream cachecls registry eventlog custapp cgiapp wformat whtml wtex rttiutils avl_tree
+override TARGET_UNITS+=$(CLASSES10) contnrs inifiles ezcgi pipes rtfpars idea base64 gettext iostream zstream cachecls avl_tree xmlreg registry eventlog custapp cgiapp wformat whtml wtex rttiutils
 ifeq ($(OS_TARGET),linux)
 override TARGET_UNITS+=process resolve ssockets fpasync syncobjs
 endif
@@ -2554,4 +2554,4 @@ ifdef CLASSES10
 classes$(PPUEXT): $(COMPILER_UNITTARGETDIR)
 	$(COMPILER) -Ficlasses -Ficlasses/$(OS_TARGET) classes/$(OS_TARGET)/classes.pp
 endif
-xmlreg.pp: xml
+xmlreg.pp: avl_tree$(PPUEXT) xml

+ 4 - 3
fcl/Makefile.fpc

@@ -22,8 +22,8 @@ units=adler gzcrc gzio infblock infcodes inffast inftrees infutil minigzip paszl
 [target]
 dirs=xml image db shedit passrc net
 units=$(CLASSES10) contnrs inifiles ezcgi pipes rtfpars idea base64 gettext \
-      iostream zstream cachecls xmlreg registry eventlog custapp cgiapp \
-      wformat whtml wtex rttiutils avl_tree
+      iostream zstream cachecls avl_tree xmlreg registry eventlog custapp cgiapp \
+      wformat whtml wtex rttiutils
 units_freebsd=process ssockets resolve fpasync syncobjs
 units_darwin=process ssockets resolve fpasync syncobjs
 units_netbsd=process ssockets resolve fpasync
@@ -70,4 +70,5 @@ classes$(PPUEXT): $(COMPILER_UNITTARGETDIR)
 	$(COMPILER) -Ficlasses -Ficlasses/$(OS_TARGET) classes/$(OS_TARGET)/classes.pp
 endif
 
-xmlreg.pp: xml
+# xmlreg needs the XML units, XML units depend on avl_tree
+xmlreg.pp: avl_tree$(PPUEXT) xml