diff --git a/fcl/linux/Makefile b/fcl/linux/Makefile index 4aa4cf1204..08f5ad4dbc 100644 --- a/fcl/linux/Makefile +++ b/fcl/linux/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/02/08] +# Makefile generated by fpcmake v0.99.13 [2000/02/24] # defaultrule: all @@ -229,7 +229,7 @@ endif # Packages -override PACKAGES+=rtl zlib +override PACKAGES+=rtl zlib inet # Libraries @@ -526,6 +526,7 @@ endif PACKAGERTL=1 PACKAGEZLIB=1 +PACKAGEINET=1 ifdef PACKAGERTL ifneq ($(wildcard $(FPCDIR)/rtl),) @@ -585,6 +586,35 @@ ifdef UNITDIR_ZLIB override NEEDUNITDIR+=$(UNITDIR_ZLIB) endif endif +ifdef PACKAGEINET +ifneq ($(wildcard $(PACKAGESDIR)/inet),) +ifneq ($(wildcard $(PACKAGESDIR)/inet/$(OS_TARGET)),) +PACKAGEDIR_INET=$(PACKAGESDIR)/inet/$(OS_TARGET) +else +PACKAGEDIR_INET=$(PACKAGESDIR)/inet +endif +ifeq ($(wildcard $(PACKAGEDIR_INET)/$(FPCMADE)),) +override COMPILEPACKAGES+=package_inet +package_inet: + $(MAKE) -C $(PACKAGEDIR_INET) all +endif +UNITDIR_INET=$(PACKAGEDIR_INET) +else +PACKAGEDIR_INET= +ifneq ($(wildcard $(UNITSDIR)/inet),) +ifneq ($(wildcard $(UNITSDIR)/inet/$(OS_TARGET)),) +UNITDIR_INET=$(UNITSDIR)/inet/$(OS_TARGET) +else +UNITDIR_INET=$(UNITSDIR)/inet +endif +else +UNITDIR_INET= +endif +endif +ifdef UNITDIR_INET +override NEEDUNITDIR+=$(UNITDIR_INET) +endif +endif ##################################################################### @@ -749,6 +779,16 @@ override FPCOPT+=-Xs -OG2p3 -n endif endif +# Strip +ifdef STRIP +override FPCOPT+=-Xs +endif + +# Optimizer +ifdef OPTIMIZE +override FPCOPT+=-OG2p3 +endif + # Verbose settings (warning,note,info) ifdef VERBOSE override FPCOPT+=-vwni diff --git a/fcl/linux/Makefile.fpc b/fcl/linux/Makefile.fpc index c6d35375c5..b84df991bc 100644 --- a/fcl/linux/Makefile.fpc +++ b/fcl/linux/Makefile.fpc @@ -10,7 +10,7 @@ defaulttarget=linux [require] options=-S2 -packages=zlib +packages=zlib inet [install] unitsubdir=fcl