diff options
230 files changed, 1037 insertions, 13998 deletions
diff --git a/packages/Makefile b/packages/Makefile index 223987ab56..9fe55dcdf0 100644 --- a/packages/Makefile +++ b/packages/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -679,18 +677,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1137,12 +1123,6 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1293,12 +1273,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -1523,96 +1508,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -1643,7 +1538,7 @@ FPMAKE_OPT+=-bu fpmkunit_bootstrap: $(MAKE) -C fpmkunit bootstrap fpmake: fpmake.pp fpmkunit_bootstrap - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile $(FPMAKE_OPT) smart: fpmake diff --git a/packages/Makefile.fpc b/packages/Makefile.fpc index 2fa6c71a9e..4544cfd0da 100644 --- a/packages/Makefile.fpc +++ b/packages/Makefile.fpc @@ -61,7 +61,7 @@ FPMAKE_OPT+=-bu fpmkunit_bootstrap: $(MAKE) -C fpmkunit bootstrap fpmake: fpmake.pp fpmkunit_bootstrap - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile $(FPMAKE_OPT) smart: fpmake diff --git a/packages/a52/Makefile b/packages/a52/Makefile index c5d7b7d43b..2a41eb4084 100644 --- a/packages/a52/Makefile +++ b/packages/a52/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/a52/Makefile.fpc b/packages/a52/Makefile.fpc index 31357a3bbd..8227412922 100644 --- a/packages/a52/Makefile.fpc +++ b/packages/a52/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/amunits/Makefile b/packages/amunits/Makefile index da7de1ee41..3564ff6644 100644 --- a/packages/amunits/Makefile +++ b/packages/amunits/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/amunits/Makefile.fpc b/packages/amunits/Makefile.fpc index fd5791530a..8a9ad6432c 100644 --- a/packages/amunits/Makefile.fpc +++ b/packages/amunits/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/aspell/Makefile b/packages/aspell/Makefile index 5adef9328d..85edd6dafe 100644 --- a/packages/aspell/Makefile +++ b/packages/aspell/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/aspell/Makefile.fpc b/packages/aspell/Makefile.fpc index b1a4ee465e..5fe39ae68e 100644 --- a/packages/aspell/Makefile.fpc +++ b/packages/aspell/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/bfd/Makefile b/packages/bfd/Makefile index c5b0402834..6a07e02247 100644 --- a/packages/bfd/Makefile +++ b/packages/bfd/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/bfd/Makefile.fpc b/packages/bfd/Makefile.fpc index 9c17643346..d79379d49e 100644 --- a/packages/bfd/Makefile.fpc +++ b/packages/bfd/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/bzip2/Makefile b/packages/bzip2/Makefile index dfc9d7a39d..a4f1b3730d 100644 --- a/packages/bzip2/Makefile +++ b/packages/bzip2/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/bzip2/Makefile.fpc b/packages/bzip2/Makefile.fpc index c7ca848f99..5fa5cc1e12 100644 --- a/packages/bzip2/Makefile.fpc +++ b/packages/bzip2/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/cairo/Makefile b/packages/cairo/Makefile index 0ba7b02e77..e5c153fc03 100644 --- a/packages/cairo/Makefile +++ b/packages/cairo/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/cairo/Makefile.fpc b/packages/cairo/Makefile.fpc index 3f84e076c5..c4c8e17b1d 100644 --- a/packages/cairo/Makefile.fpc +++ b/packages/cairo/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/cdrom/Makefile b/packages/cdrom/Makefile index da28052e79..062952dbc4 100644 --- a/packages/cdrom/Makefile +++ b/packages/cdrom/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/cdrom/Makefile.fpc b/packages/cdrom/Makefile.fpc index ba5b21bf03..3a12e54a71 100644 --- a/packages/cdrom/Makefile.fpc +++ b/packages/cdrom/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/chm/Makefile b/packages/chm/Makefile index 80c1afc7e4..96ed469e40 100644 --- a/packages/chm/Makefile +++ b/packages/chm/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -667,18 +665,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1397,20 +1383,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1713,12 +1685,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2096,96 +2073,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2204,7 +2091,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/chm/Makefile.fpc b/packages/chm/Makefile.fpc index ae6b15b3cb..592626e48c 100644 --- a/packages/chm/Makefile.fpc +++ b/packages/chm/Makefile.fpc @@ -36,7 +36,7 @@ endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/cocoaint/Makefile b/packages/cocoaint/Makefile index 0db4f2552d..47f3c9bd82 100644 --- a/packages/cocoaint/Makefile +++ b/packages/cocoaint/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/cocoaint/Makefile.fpc b/packages/cocoaint/Makefile.fpc index 5780868152..230e628322 100644 --- a/packages/cocoaint/Makefile.fpc +++ b/packages/cocoaint/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/dblib/Makefile b/packages/dblib/Makefile index 1680301c9d..b940725aef 100644 --- a/packages/dblib/Makefile +++ b/packages/dblib/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/dblib/Makefile.fpc b/packages/dblib/Makefile.fpc index 8c9ab93090..542eddad17 100644 --- a/packages/dblib/Makefile.fpc +++ b/packages/dblib/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/dbus/Makefile b/packages/dbus/Makefile index 42d9c8dc61..98659be526 100644 --- a/packages/dbus/Makefile +++ b/packages/dbus/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/dbus/Makefile.fpc b/packages/dbus/Makefile.fpc index 0e6d58cf1b..d7e7f9f595 100644 --- a/packages/dbus/Makefile.fpc +++ b/packages/dbus/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/dts/Makefile b/packages/dts/Makefile index 0923a13817..d256e7627a 100644 --- a/packages/dts/Makefile +++ b/packages/dts/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/dts/Makefile.fpc b/packages/dts/Makefile.fpc index ec544448d7..6c2be43766 100644 --- a/packages/dts/Makefile.fpc +++ b/packages/dts/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/fastcgi/Makefile b/packages/fastcgi/Makefile index a71307d277..3bfabaf744 100644 --- a/packages/fastcgi/Makefile +++ b/packages/fastcgi/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/fastcgi/Makefile.fpc b/packages/fastcgi/Makefile.fpc index 93737ac9c9..7c62f51d6f 100644 --- a/packages/fastcgi/Makefile.fpc +++ b/packages/fastcgi/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/fcl-async/Makefile b/packages/fcl-async/Makefile index 32b4ebd8c5..6583360a25 100644 --- a/packages/fcl-async/Makefile +++ b/packages/fcl-async/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/fcl-async/Makefile.fpc b/packages/fcl-async/Makefile.fpc index 8026c248d1..19b027259c 100644 --- a/packages/fcl-async/Makefile.fpc +++ b/packages/fcl-async/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/fcl-base/Makefile b/packages/fcl-base/Makefile index 699d7652ce..fe99c3687c 100644 --- a/packages/fcl-base/Makefile +++ b/packages/fcl-base/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/fcl-base/Makefile.fpc b/packages/fcl-base/Makefile.fpc index 0260a338e8..ef9bb8d06a 100644 --- a/packages/fcl-base/Makefile.fpc +++ b/packages/fcl-base/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/fcl-db/Makefile b/packages/fcl-db/Makefile index 9f42ddbf69..9c7fa9449e 100644 --- a/packages/fcl-db/Makefile +++ b/packages/fcl-db/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/fcl-db/Makefile.fpc b/packages/fcl-db/Makefile.fpc index 90d59def03..0db65b3a0f 100644 --- a/packages/fcl-db/Makefile.fpc +++ b/packages/fcl-db/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/fcl-extra/Makefile b/packages/fcl-extra/Makefile index befa722e7f..c83716935d 100644 --- a/packages/fcl-extra/Makefile +++ b/packages/fcl-extra/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/fcl-extra/Makefile.fpc b/packages/fcl-extra/Makefile.fpc index c7865dfc51..3fb177ce01 100644 --- a/packages/fcl-extra/Makefile.fpc +++ b/packages/fcl-extra/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/fcl-fpcunit/Makefile b/packages/fcl-fpcunit/Makefile index 0ae664e823..fc026d4a5f 100644 --- a/packages/fcl-fpcunit/Makefile +++ b/packages/fcl-fpcunit/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/fcl-fpcunit/Makefile.fpc b/packages/fcl-fpcunit/Makefile.fpc index e3e1a97e39..d86e7642bd 100644 --- a/packages/fcl-fpcunit/Makefile.fpc +++ b/packages/fcl-fpcunit/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/fcl-image/Makefile b/packages/fcl-image/Makefile index 4cdaef641b..2dc4b96480 100644 --- a/packages/fcl-image/Makefile +++ b/packages/fcl-image/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/fcl-image/Makefile.fpc b/packages/fcl-image/Makefile.fpc index 2e033db538..4d008c2bdd 100644 --- a/packages/fcl-image/Makefile.fpc +++ b/packages/fcl-image/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/fcl-js/Makefile b/packages/fcl-js/Makefile index 0d7fee5852..2a080c2f1c 100644 --- a/packages/fcl-js/Makefile +++ b/packages/fcl-js/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/fcl-js/Makefile.fpc b/packages/fcl-js/Makefile.fpc index b49b5d5f60..4c398958a0 100644 --- a/packages/fcl-js/Makefile.fpc +++ b/packages/fcl-js/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/fcl-json/Makefile b/packages/fcl-json/Makefile index af7be18b60..36c7de9ac3 100644 --- a/packages/fcl-json/Makefile +++ b/packages/fcl-json/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/fcl-json/Makefile.fpc b/packages/fcl-json/Makefile.fpc index 93488406e9..e9be854bf8 100644 --- a/packages/fcl-json/Makefile.fpc +++ b/packages/fcl-json/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/fcl-net/Makefile b/packages/fcl-net/Makefile index 140f77db68..0acef97aa0 100644 --- a/packages/fcl-net/Makefile +++ b/packages/fcl-net/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/fcl-net/Makefile.fpc b/packages/fcl-net/Makefile.fpc index 5e1969f672..5a57cefd87 100644 --- a/packages/fcl-net/Makefile.fpc +++ b/packages/fcl-net/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/fcl-passrc/Makefile b/packages/fcl-passrc/Makefile index 017f157011..6eb9552a00 100644 --- a/packages/fcl-passrc/Makefile +++ b/packages/fcl-passrc/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/fcl-passrc/Makefile.fpc b/packages/fcl-passrc/Makefile.fpc index 7fdcbb8ebc..41aab81f0c 100644 --- a/packages/fcl-passrc/Makefile.fpc +++ b/packages/fcl-passrc/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/fcl-process/Makefile b/packages/fcl-process/Makefile index b89d8e90b3..c8ec51d839 100644 --- a/packages/fcl-process/Makefile +++ b/packages/fcl-process/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -686,18 +684,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1144,12 +1130,6 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1300,12 +1280,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -1683,96 +1668,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -1791,7 +1686,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/fcl-process/Makefile.fpc b/packages/fcl-process/Makefile.fpc index 2db11ea432..0b0716905b 100644 --- a/packages/fcl-process/Makefile.fpc +++ b/packages/fcl-process/Makefile.fpc @@ -55,7 +55,7 @@ endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/fcl-registry/Makefile b/packages/fcl-registry/Makefile index d7a91c7dab..47fb1e4a67 100644 --- a/packages/fcl-registry/Makefile +++ b/packages/fcl-registry/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/fcl-registry/Makefile.fpc b/packages/fcl-registry/Makefile.fpc index 4e40aae995..82d5472fca 100644 --- a/packages/fcl-registry/Makefile.fpc +++ b/packages/fcl-registry/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/fcl-res/Makefile b/packages/fcl-res/Makefile index 3448f0a595..937cfdfa08 100644 --- a/packages/fcl-res/Makefile +++ b/packages/fcl-res/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/fcl-res/Makefile.fpc b/packages/fcl-res/Makefile.fpc index eb1bb3d6bb..8bdea90ff8 100644 --- a/packages/fcl-res/Makefile.fpc +++ b/packages/fcl-res/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/fcl-stl/Makefile b/packages/fcl-stl/Makefile index 24b8a24101..e999b8a3ee 100644 --- a/packages/fcl-stl/Makefile +++ b/packages/fcl-stl/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/fcl-stl/Makefile.fpc b/packages/fcl-stl/Makefile.fpc index d0d25b03c2..f2ccba93de 100644 --- a/packages/fcl-stl/Makefile.fpc +++ b/packages/fcl-stl/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/fcl-web/Makefile b/packages/fcl-web/Makefile index fd3cbcb757..c5537cf851 100644 --- a/packages/fcl-web/Makefile +++ b/packages/fcl-web/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/fcl-web/Makefile.fpc b/packages/fcl-web/Makefile.fpc index 4ce18199a3..97b75ff5c5 100644 --- a/packages/fcl-web/Makefile.fpc +++ b/packages/fcl-web/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/fcl-xml/Makefile b/packages/fcl-xml/Makefile index 07f100e0f9..a50d02b143 100644 --- a/packages/fcl-xml/Makefile +++ b/packages/fcl-xml/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/fcl-xml/Makefile.fpc b/packages/fcl-xml/Makefile.fpc index ab561acf49..f4ad0e2d8f 100644 --- a/packages/fcl-xml/Makefile.fpc +++ b/packages/fcl-xml/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/fftw/Makefile b/packages/fftw/Makefile index 50e3380f5b..7591e530ef 100644 --- a/packages/fftw/Makefile +++ b/packages/fftw/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/fftw/Makefile.fpc b/packages/fftw/Makefile.fpc index fb5f9fe359..35c2d69671 100644 --- a/packages/fftw/Makefile.fpc +++ b/packages/fftw/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/fpgtk/Makefile b/packages/fpgtk/Makefile index 5ce177012e..3eaaf35573 100644 --- a/packages/fpgtk/Makefile +++ b/packages/fpgtk/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/fpgtk/Makefile.fpc b/packages/fpgtk/Makefile.fpc index 741fe548a3..e63bf59141 100644 --- a/packages/fpgtk/Makefile.fpc +++ b/packages/fpgtk/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/fpindexer/Makefile b/packages/fpindexer/Makefile index bdaf4a00d9..6360198b2c 100644 --- a/packages/fpindexer/Makefile +++ b/packages/fpindexer/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/fpindexer/Makefile.fpc b/packages/fpindexer/Makefile.fpc index 6f91620554..0faf5af34f 100644 --- a/packages/fpindexer/Makefile.fpc +++ b/packages/fpindexer/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/fpmkunit/Makefile b/packages/fpmkunit/Makefile index 9e0920d0c5..8f828f4393 100644 --- a/packages/fpmkunit/Makefile +++ b/packages/fpmkunit/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -695,18 +693,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1357,18 +1343,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1633,12 +1607,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2016,96 +1995,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2126,9 +2015,9 @@ endif $(TARGET_UNITDIRBS): $(MKDIRTREE) $(TARGET_UNITDIRBS) bootstrap: $(TARGET_UNITDIRBS) - $(FPCFPMAKE) src/fpmkunit.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) -FU$(TARGET_UNITDIRBS) $(UNIT_ZIPPER) $(UNIT_PROCESS) + $(FPCFPMAKE) src/fpmkunit.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) -FU$(TARGET_UNITDIRBS) $(UNIT_ZIPPER) $(UNIT_PROCESS) fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(UNITDIR_FPMAKE_RTL)) $(FPCMAKEOPT) -Fu$(TARGET_UNITDIRBS) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(UNITDIR_FPMAKE_RTL)) $(FPCMAKEOPT) -Fu$(TARGET_UNITDIRBS) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/fpmkunit/Makefile.fpc b/packages/fpmkunit/Makefile.fpc index 68c7fabe44..ad331b701b 100644 --- a/packages/fpmkunit/Makefile.fpc +++ b/packages/fpmkunit/Makefile.fpc @@ -67,9 +67,9 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) $(TARGET_UNITDIRBS): $(MKDIRTREE) $(TARGET_UNITDIRBS) bootstrap: $(TARGET_UNITDIRBS) - $(FPCFPMAKE) src/fpmkunit.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) -FU$(TARGET_UNITDIRBS) $(UNIT_ZIPPER) $(UNIT_PROCESS) + $(FPCFPMAKE) src/fpmkunit.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) -FU$(TARGET_UNITDIRBS) $(UNIT_ZIPPER) $(UNIT_PROCESS) fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(UNITDIR_FPMAKE_RTL)) $(FPCMAKEOPT) -Fu$(TARGET_UNITDIRBS) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(UNITDIR_FPMAKE_RTL)) $(FPCMAKEOPT) -Fu$(TARGET_UNITDIRBS) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/fppkg/Makefile b/packages/fppkg/Makefile index 55cdf3123f..9b3b0c39b2 100644 --- a/packages/fppkg/Makefile +++ b/packages/fppkg/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/fppkg/Makefile.fpc b/packages/fppkg/Makefile.fpc index 3bc93ab74e..5f68db8a1d 100644 --- a/packages/fppkg/Makefile.fpc +++ b/packages/fppkg/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/fuse/Makefile b/packages/fuse/Makefile index 6f29fbd9c3..203d7dc007 100644 --- a/packages/fuse/Makefile +++ b/packages/fuse/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/fuse/Makefile.fpc b/packages/fuse/Makefile.fpc index 229d92e98b..dd1442e50b 100644 --- a/packages/fuse/Makefile.fpc +++ b/packages/fuse/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/fv/Makefile b/packages/fv/Makefile index 5b1c849da8..04fd1bb0b4 100644 --- a/packages/fv/Makefile +++ b/packages/fv/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/fv/Makefile.fpc b/packages/fv/Makefile.fpc index ff6fdcd082..3896b5d109 100644 --- a/packages/fv/Makefile.fpc +++ b/packages/fv/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/gdbint/Makefile b/packages/gdbint/Makefile index 677c8486ea..e4c08b3109 100644 --- a/packages/gdbint/Makefile +++ b/packages/gdbint/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2201,7 +2088,7 @@ override FPCOPT:=$(filter-out -FU%,$(FPCOPT)) override FPCOPT:=$(filter-out -FE%,$(FPCOPT)) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/gdbint/Makefile.fpc b/packages/gdbint/Makefile.fpc index 5f41ac5a0d..3539b87e89 100644 --- a/packages/gdbint/Makefile.fpc +++ b/packages/gdbint/Makefile.fpc @@ -32,7 +32,7 @@ override FPCOPT:=$(filter-out -FE%,$(FPCOPT)) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/gdbm/Makefile b/packages/gdbm/Makefile index f00329655d..689b5b0cdd 100644 --- a/packages/gdbm/Makefile +++ b/packages/gdbm/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/gdbm/Makefile.fpc b/packages/gdbm/Makefile.fpc index 84bc2334e5..9c9fd70d22 100644 --- a/packages/gdbm/Makefile.fpc +++ b/packages/gdbm/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/ggi/Makefile b/packages/ggi/Makefile index 3bd014c222..25f2ab6bc6 100644 --- a/packages/ggi/Makefile +++ b/packages/ggi/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/ggi/Makefile.fpc b/packages/ggi/Makefile.fpc index aaf93308b9..9de0094380 100644 --- a/packages/ggi/Makefile.fpc +++ b/packages/ggi/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/gmp/Makefile b/packages/gmp/Makefile index 1531ae1bed..1271175a72 100644 --- a/packages/gmp/Makefile +++ b/packages/gmp/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/gmp/Makefile.fpc b/packages/gmp/Makefile.fpc index a1989e70a4..d9f4b5bbbe 100644 --- a/packages/gmp/Makefile.fpc +++ b/packages/gmp/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/gnome1/Makefile b/packages/gnome1/Makefile index 54116f297e..89084762a1 100644 --- a/packages/gnome1/Makefile +++ b/packages/gnome1/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/gnome1/Makefile.fpc b/packages/gnome1/Makefile.fpc index 4f6890a0eb..a65e0ffcf4 100644 --- a/packages/gnome1/Makefile.fpc +++ b/packages/gnome1/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/graph/Makefile b/packages/graph/Makefile index 336a092020..3b9b6ddc1f 100644 --- a/packages/graph/Makefile +++ b/packages/graph/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/graph/Makefile.fpc b/packages/graph/Makefile.fpc index 8b1b60a219..18572cfa87 100644 --- a/packages/graph/Makefile.fpc +++ b/packages/graph/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/gtk1/Makefile b/packages/gtk1/Makefile index c2c90302aa..3ab82c4e61 100644 --- a/packages/gtk1/Makefile +++ b/packages/gtk1/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/gtk1/Makefile.fpc b/packages/gtk1/Makefile.fpc index a58805b4be..ca47ff3f59 100644 --- a/packages/gtk1/Makefile.fpc +++ b/packages/gtk1/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/gtk2/Makefile b/packages/gtk2/Makefile index d5571392ac..0ef63f7560 100644 --- a/packages/gtk2/Makefile +++ b/packages/gtk2/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/gtk2/Makefile.fpc b/packages/gtk2/Makefile.fpc index 6b2742af4a..7dd9456177 100644 --- a/packages/gtk2/Makefile.fpc +++ b/packages/gtk2/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/hash/Makefile b/packages/hash/Makefile index cafbd3a7d2..bdeb64e60b 100644 --- a/packages/hash/Makefile +++ b/packages/hash/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -686,18 +684,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1144,12 +1130,6 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1300,12 +1280,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -1683,96 +1668,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -1791,7 +1686,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/hash/Makefile.fpc b/packages/hash/Makefile.fpc index 5dca40023d..d47fa24e8e 100644 --- a/packages/hash/Makefile.fpc +++ b/packages/hash/Makefile.fpc @@ -55,7 +55,7 @@ endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/hermes/Makefile b/packages/hermes/Makefile index 5a1cfe6988..944228939a 100644 --- a/packages/hermes/Makefile +++ b/packages/hermes/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/hermes/Makefile.fpc b/packages/hermes/Makefile.fpc index f185b63c87..15dac9a6ac 100644 --- a/packages/hermes/Makefile.fpc +++ b/packages/hermes/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/httpd13/Makefile b/packages/httpd13/Makefile index 31f1809701..349e59178a 100644 --- a/packages/httpd13/Makefile +++ b/packages/httpd13/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/httpd13/Makefile.fpc b/packages/httpd13/Makefile.fpc index 1fed2845b7..12e0212ab1 100644 --- a/packages/httpd13/Makefile.fpc +++ b/packages/httpd13/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/httpd20/Makefile b/packages/httpd20/Makefile index 51150f792e..905d777f35 100644 --- a/packages/httpd20/Makefile +++ b/packages/httpd20/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/httpd20/Makefile.fpc b/packages/httpd20/Makefile.fpc index 070553cb9d..141c8d3d68 100644 --- a/packages/httpd20/Makefile.fpc +++ b/packages/httpd20/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/httpd22/Makefile b/packages/httpd22/Makefile index 158b5b9f61..000f670a0d 100644 --- a/packages/httpd22/Makefile +++ b/packages/httpd22/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/httpd22/Makefile.fpc b/packages/httpd22/Makefile.fpc index 296c6aeb4a..4f3b3b577f 100644 --- a/packages/httpd22/Makefile.fpc +++ b/packages/httpd22/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/ibase/Makefile b/packages/ibase/Makefile index dc06e6ceba..aaee03af43 100644 --- a/packages/ibase/Makefile +++ b/packages/ibase/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/ibase/Makefile.fpc b/packages/ibase/Makefile.fpc index 3b1d233b0a..a409db842d 100644 --- a/packages/ibase/Makefile.fpc +++ b/packages/ibase/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/iconvenc/Makefile b/packages/iconvenc/Makefile index 595440f908..3f6297b964 100644 --- a/packages/iconvenc/Makefile +++ b/packages/iconvenc/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/iconvenc/Makefile.fpc b/packages/iconvenc/Makefile.fpc index d460948805..5cfb0b8a68 100644 --- a/packages/iconvenc/Makefile.fpc +++ b/packages/iconvenc/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/imagemagick/Makefile b/packages/imagemagick/Makefile index 7787517e25..a859c0e62a 100644 --- a/packages/imagemagick/Makefile +++ b/packages/imagemagick/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/imagemagick/Makefile.fpc b/packages/imagemagick/Makefile.fpc index 00ae508df3..12aeb7fea1 100644 --- a/packages/imagemagick/Makefile.fpc +++ b/packages/imagemagick/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/imlib/Makefile b/packages/imlib/Makefile index 48097b619a..524204804f 100644 --- a/packages/imlib/Makefile +++ b/packages/imlib/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/imlib/Makefile.fpc b/packages/imlib/Makefile.fpc index d037c03c90..2425ce77c9 100644 --- a/packages/imlib/Makefile.fpc +++ b/packages/imlib/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/ldap/Makefile b/packages/ldap/Makefile index 7563cfc84f..82512abe0b 100644 --- a/packages/ldap/Makefile +++ b/packages/ldap/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/ldap/Makefile.fpc b/packages/ldap/Makefile.fpc index baf3b068c6..33437ed864 100644 --- a/packages/ldap/Makefile.fpc +++ b/packages/ldap/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/libc/Makefile b/packages/libc/Makefile index abe90a197a..6e9acfc090 100644 --- a/packages/libc/Makefile +++ b/packages/libc/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/libc/Makefile.fpc b/packages/libc/Makefile.fpc index ec4d10b9e8..311d676e86 100644 --- a/packages/libc/Makefile.fpc +++ b/packages/libc/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/libcurl/Makefile b/packages/libcurl/Makefile index bd8b7eb1b2..d2f69d6f59 100644 --- a/packages/libcurl/Makefile +++ b/packages/libcurl/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/libcurl/Makefile.fpc b/packages/libcurl/Makefile.fpc index eb55c0b077..ca018af401 100644 --- a/packages/libcurl/Makefile.fpc +++ b/packages/libcurl/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/libgbafpc/Makefile b/packages/libgbafpc/Makefile index 4239660e2c..e86aeb73f0 100644 --- a/packages/libgbafpc/Makefile +++ b/packages/libgbafpc/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/libgbafpc/Makefile.fpc b/packages/libgbafpc/Makefile.fpc index cf76fadee3..3fd6d807c8 100644 --- a/packages/libgbafpc/Makefile.fpc +++ b/packages/libgbafpc/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/libgd/Makefile b/packages/libgd/Makefile index a44ec5cf7b..9df1a0d844 100644 --- a/packages/libgd/Makefile +++ b/packages/libgd/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/libgd/Makefile.fpc b/packages/libgd/Makefile.fpc index 15c39ca02e..d2420bed04 100644 --- a/packages/libgd/Makefile.fpc +++ b/packages/libgd/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/libndsfpc/Makefile b/packages/libndsfpc/Makefile index 3fee8851ae..7e5571068d 100644 --- a/packages/libndsfpc/Makefile +++ b/packages/libndsfpc/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/libndsfpc/Makefile.fpc b/packages/libndsfpc/Makefile.fpc index 891004b684..a8207adcc8 100644 --- a/packages/libndsfpc/Makefile.fpc +++ b/packages/libndsfpc/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/libogcfpc/Makefile b/packages/libogcfpc/Makefile index 9b97d3a8e8..d9b3a458d7 100644 --- a/packages/libogcfpc/Makefile +++ b/packages/libogcfpc/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/libogcfpc/Makefile.fpc b/packages/libogcfpc/Makefile.fpc index ac9de536ca..ac071a850c 100644 --- a/packages/libogcfpc/Makefile.fpc +++ b/packages/libogcfpc/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/libpng/Makefile b/packages/libpng/Makefile index 3f325591b7..3b3dab3384 100644 --- a/packages/libpng/Makefile +++ b/packages/libpng/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/libpng/Makefile.fpc b/packages/libpng/Makefile.fpc index 77dd5928f7..0bc07b22f1 100644 --- a/packages/libpng/Makefile.fpc +++ b/packages/libpng/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/librsvg/Makefile b/packages/librsvg/Makefile index 26094ffccc..b43bbe2999 100644 --- a/packages/librsvg/Makefile +++ b/packages/librsvg/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/librsvg/Makefile.fpc b/packages/librsvg/Makefile.fpc index afcbeb35d3..435f8390b7 100644 --- a/packages/librsvg/Makefile.fpc +++ b/packages/librsvg/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/libsee/Makefile b/packages/libsee/Makefile index 57332416af..8250554fd7 100644 --- a/packages/libsee/Makefile +++ b/packages/libsee/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/libsee/Makefile.fpc b/packages/libsee/Makefile.fpc index 0a4811eac0..b66b381e9b 100644 --- a/packages/libsee/Makefile.fpc +++ b/packages/libsee/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/libxml/Makefile b/packages/libxml/Makefile index 6fc69857e6..5539cc3997 100644 --- a/packages/libxml/Makefile +++ b/packages/libxml/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/libxml/Makefile.fpc b/packages/libxml/Makefile.fpc index d7a3135c3d..6ae5ae2631 100644 --- a/packages/libxml/Makefile.fpc +++ b/packages/libxml/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/lua/Makefile b/packages/lua/Makefile index d4979d6f7a..79eca410e1 100644 --- a/packages/lua/Makefile +++ b/packages/lua/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/lua/Makefile.fpc b/packages/lua/Makefile.fpc index 096915de5f..54b556400e 100644 --- a/packages/lua/Makefile.fpc +++ b/packages/lua/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/mad/Makefile b/packages/mad/Makefile index 664baca807..10ad0f7adf 100644 --- a/packages/mad/Makefile +++ b/packages/mad/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/mad/Makefile.fpc b/packages/mad/Makefile.fpc index ecc1294cf9..f40080c253 100644 --- a/packages/mad/Makefile.fpc +++ b/packages/mad/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/matroska/Makefile b/packages/matroska/Makefile index de3973c9e0..7520214b17 100644 --- a/packages/matroska/Makefile +++ b/packages/matroska/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/matroska/Makefile.fpc b/packages/matroska/Makefile.fpc index 7c4d010512..c30ab77fa6 100644 --- a/packages/matroska/Makefile.fpc +++ b/packages/matroska/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/modplug/Makefile b/packages/modplug/Makefile index a0b25389ba..553f87274f 100644 --- a/packages/modplug/Makefile +++ b/packages/modplug/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/modplug/Makefile.fpc b/packages/modplug/Makefile.fpc index a1ebc57e85..35bed04305 100644 --- a/packages/modplug/Makefile.fpc +++ b/packages/modplug/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/mysql/Makefile b/packages/mysql/Makefile index af740d13bd..48e0887038 100644 --- a/packages/mysql/Makefile +++ b/packages/mysql/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/mysql/Makefile.fpc b/packages/mysql/Makefile.fpc index b13950e16b..3bddabe888 100644 --- a/packages/mysql/Makefile.fpc +++ b/packages/mysql/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/ncurses/Makefile b/packages/ncurses/Makefile index 359b9cc712..cc24a5d8fb 100644 --- a/packages/ncurses/Makefile +++ b/packages/ncurses/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/ncurses/Makefile.fpc b/packages/ncurses/Makefile.fpc index 12b28ce116..aeadcc9ee2 100644 --- a/packages/ncurses/Makefile.fpc +++ b/packages/ncurses/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/newt/Makefile b/packages/newt/Makefile index 95ae4ce5e8..610161e9c1 100644 --- a/packages/newt/Makefile +++ b/packages/newt/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/newt/Makefile.fpc b/packages/newt/Makefile.fpc index 8a47aa7578..c5bf376d31 100644 --- a/packages/newt/Makefile.fpc +++ b/packages/newt/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/numlib/Makefile b/packages/numlib/Makefile index 116eed9608..faf65e77a9 100644 --- a/packages/numlib/Makefile +++ b/packages/numlib/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/numlib/Makefile.fpc b/packages/numlib/Makefile.fpc index 001b680755..b53a887af3 100644 --- a/packages/numlib/Makefile.fpc +++ b/packages/numlib/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/nvapi/Makefile b/packages/nvapi/Makefile index 187c0fd62c..f3c3a46491 100644 --- a/packages/nvapi/Makefile +++ b/packages/nvapi/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/nvapi/Makefile.fpc b/packages/nvapi/Makefile.fpc index 4d62654c31..4bed212d2a 100644 --- a/packages/nvapi/Makefile.fpc +++ b/packages/nvapi/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/objcrtl/Makefile b/packages/objcrtl/Makefile index 350e23f1db..43ab625fe8 100644 --- a/packages/objcrtl/Makefile +++ b/packages/objcrtl/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/objcrtl/Makefile.fpc b/packages/objcrtl/Makefile.fpc index 4d1a171c57..59656beccf 100644 --- a/packages/objcrtl/Makefile.fpc +++ b/packages/objcrtl/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/odbc/Makefile b/packages/odbc/Makefile index 712f9a601b..a58dbe2089 100644 --- a/packages/odbc/Makefile +++ b/packages/odbc/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/odbc/Makefile.fpc b/packages/odbc/Makefile.fpc index fbca5ffd89..7c404b1e57 100644 --- a/packages/odbc/Makefile.fpc +++ b/packages/odbc/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/oggvorbis/Makefile b/packages/oggvorbis/Makefile index f5e9594ce8..af90479b84 100644 --- a/packages/oggvorbis/Makefile +++ b/packages/oggvorbis/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/oggvorbis/Makefile.fpc b/packages/oggvorbis/Makefile.fpc index 042e2e0b07..4ab667f7ef 100644 --- a/packages/oggvorbis/Makefile.fpc +++ b/packages/oggvorbis/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/openal/Makefile b/packages/openal/Makefile index fec00741f2..f3f84b16ed 100644 --- a/packages/openal/Makefile +++ b/packages/openal/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/openal/Makefile.fpc b/packages/openal/Makefile.fpc index 47fbc65e76..0c5edd8ee5 100644 --- a/packages/openal/Makefile.fpc +++ b/packages/openal/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/opencl/Makefile b/packages/opencl/Makefile index cd07095721..1d7b9d996e 100644 --- a/packages/opencl/Makefile +++ b/packages/opencl/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/opencl/Makefile.fpc b/packages/opencl/Makefile.fpc index a25f947a22..9e914b0a67 100644 --- a/packages/opencl/Makefile.fpc +++ b/packages/opencl/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/opengl/Makefile b/packages/opengl/Makefile index 345f528a4d..5483fa1b61 100644 --- a/packages/opengl/Makefile +++ b/packages/opengl/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/opengl/Makefile.fpc b/packages/opengl/Makefile.fpc index 43e0be8d9a..05a7def4b6 100644 --- a/packages/opengl/Makefile.fpc +++ b/packages/opengl/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/opengles/Makefile b/packages/opengles/Makefile index c791de5d8e..066242f699 100644 --- a/packages/opengles/Makefile +++ b/packages/opengles/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/opengles/Makefile.fpc b/packages/opengles/Makefile.fpc index 96eaf3a8cf..f670cb0385 100644 --- a/packages/opengles/Makefile.fpc +++ b/packages/opengles/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/openssl/Makefile b/packages/openssl/Makefile index db764ec8ef..056c41730f 100644 --- a/packages/openssl/Makefile +++ b/packages/openssl/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/openssl/Makefile.fpc b/packages/openssl/Makefile.fpc index d3137c8cb6..c07cd4bbd4 100644 --- a/packages/openssl/Makefile.fpc +++ b/packages/openssl/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/oracle/Makefile b/packages/oracle/Makefile index d5ca586525..048da5bd92 100644 --- a/packages/oracle/Makefile +++ b/packages/oracle/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/oracle/Makefile.fpc b/packages/oracle/Makefile.fpc index 7238d15e53..ad753445b0 100644 --- a/packages/oracle/Makefile.fpc +++ b/packages/oracle/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/os2units/Makefile b/packages/os2units/Makefile index 3aae19fa91..c3c548e442 100644 --- a/packages/os2units/Makefile +++ b/packages/os2units/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/os2units/Makefile.fpc b/packages/os2units/Makefile.fpc index dd84c11465..614e295d84 100644 --- a/packages/os2units/Makefile.fpc +++ b/packages/os2units/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/palmunits/Makefile b/packages/palmunits/Makefile index 96ef72a03f..ef16033dc4 100644 --- a/packages/palmunits/Makefile +++ b/packages/palmunits/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/palmunits/Makefile.fpc b/packages/palmunits/Makefile.fpc index 1922f62350..23caf86cdb 100644 --- a/packages/palmunits/Makefile.fpc +++ b/packages/palmunits/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/pasjpeg/Makefile b/packages/pasjpeg/Makefile index ac0a3dfe91..b895fc5869 100644 --- a/packages/pasjpeg/Makefile +++ b/packages/pasjpeg/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/pasjpeg/Makefile.fpc b/packages/pasjpeg/Makefile.fpc index 3d8d19c98d..0328dd5781 100644 --- a/packages/pasjpeg/Makefile.fpc +++ b/packages/pasjpeg/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/paszlib/Makefile b/packages/paszlib/Makefile index 547abcffbf..f9fd95d96a 100644 --- a/packages/paszlib/Makefile +++ b/packages/paszlib/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -686,18 +684,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1144,12 +1130,6 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1300,12 +1280,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -1683,96 +1668,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -1791,7 +1686,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/paszlib/Makefile.fpc b/packages/paszlib/Makefile.fpc index ad1edfe14b..e446374462 100644 --- a/packages/paszlib/Makefile.fpc +++ b/packages/paszlib/Makefile.fpc @@ -55,7 +55,7 @@ endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/pcap/Makefile b/packages/pcap/Makefile index c463a950d9..964a648588 100644 --- a/packages/pcap/Makefile +++ b/packages/pcap/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/pcap/Makefile.fpc b/packages/pcap/Makefile.fpc index 76d60fd776..0d8dadbde6 100644 --- a/packages/pcap/Makefile.fpc +++ b/packages/pcap/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/postgres/Makefile b/packages/postgres/Makefile index d7cb0ccf99..62ac3697b1 100644 --- a/packages/postgres/Makefile +++ b/packages/postgres/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/postgres/Makefile.fpc b/packages/postgres/Makefile.fpc index 14519142c0..a29f40c751 100644 --- a/packages/postgres/Makefile.fpc +++ b/packages/postgres/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/proj4/Makefile b/packages/proj4/Makefile index 3827897404..9fc7563bfb 100644 --- a/packages/proj4/Makefile +++ b/packages/proj4/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/proj4/Makefile.fpc b/packages/proj4/Makefile.fpc index f5ea789c4f..df43e84277 100644 --- a/packages/proj4/Makefile.fpc +++ b/packages/proj4/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/ptc/Makefile b/packages/ptc/Makefile index 4b457a84f6..7183178d6e 100644 --- a/packages/ptc/Makefile +++ b/packages/ptc/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/ptc/Makefile.fpc b/packages/ptc/Makefile.fpc index 66eac218eb..4b0183c164 100644 --- a/packages/ptc/Makefile.fpc +++ b/packages/ptc/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/pthreads/Makefile b/packages/pthreads/Makefile index 3bffa1168b..7b06cc6671 100644 --- a/packages/pthreads/Makefile +++ b/packages/pthreads/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/pthreads/Makefile.fpc b/packages/pthreads/Makefile.fpc index b92918936d..ab7c02ddac 100644 --- a/packages/pthreads/Makefile.fpc +++ b/packages/pthreads/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/pxlib/Makefile b/packages/pxlib/Makefile index 6dfefc914b..99b6f0e9d7 100644 --- a/packages/pxlib/Makefile +++ b/packages/pxlib/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/pxlib/Makefile.fpc b/packages/pxlib/Makefile.fpc index 6a290f594c..e57654b65b 100644 --- a/packages/pxlib/Makefile.fpc +++ b/packages/pxlib/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/regexpr/Makefile b/packages/regexpr/Makefile index 32b6331eb9..5230cfdef5 100644 --- a/packages/regexpr/Makefile +++ b/packages/regexpr/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/regexpr/Makefile.fpc b/packages/regexpr/Makefile.fpc index 6138512790..29c1fcf60e 100644 --- a/packages/regexpr/Makefile.fpc +++ b/packages/regexpr/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/rexx/Makefile b/packages/rexx/Makefile index 68a46f87e7..330035a1c2 100644 --- a/packages/rexx/Makefile +++ b/packages/rexx/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/rexx/Makefile.fpc b/packages/rexx/Makefile.fpc index 4a9be7a8e6..9a51c82b06 100644 --- a/packages/rexx/Makefile.fpc +++ b/packages/rexx/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/sdl/Makefile b/packages/sdl/Makefile index 63e0ce6807..8e4df89adc 100644 --- a/packages/sdl/Makefile +++ b/packages/sdl/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/sdl/Makefile.fpc b/packages/sdl/Makefile.fpc index 39b5fdc40e..dc034a181e 100644 --- a/packages/sdl/Makefile.fpc +++ b/packages/sdl/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/sndfile/Makefile b/packages/sndfile/Makefile index 11edf43e72..6ed45215b3 100644 --- a/packages/sndfile/Makefile +++ b/packages/sndfile/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/sndfile/Makefile.fpc b/packages/sndfile/Makefile.fpc index 295e8e3a56..ea32dc437c 100644 --- a/packages/sndfile/Makefile.fpc +++ b/packages/sndfile/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/sqlite/Makefile b/packages/sqlite/Makefile index d831d5c64f..97f01bbe28 100644 --- a/packages/sqlite/Makefile +++ b/packages/sqlite/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/sqlite/Makefile.fpc b/packages/sqlite/Makefile.fpc index 23fd47b660..f606a5ff86 100644 --- a/packages/sqlite/Makefile.fpc +++ b/packages/sqlite/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/svgalib/Makefile b/packages/svgalib/Makefile index e8952d874e..09122b2078 100644 --- a/packages/svgalib/Makefile +++ b/packages/svgalib/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/svgalib/Makefile.fpc b/packages/svgalib/Makefile.fpc index 5bb3bbffa3..a43c4bf1ad 100644 --- a/packages/svgalib/Makefile.fpc +++ b/packages/svgalib/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/symbolic/Makefile b/packages/symbolic/Makefile index 50728b88f4..4f2cc18c27 100644 --- a/packages/symbolic/Makefile +++ b/packages/symbolic/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/symbolic/Makefile.fpc b/packages/symbolic/Makefile.fpc index 3b8db955cb..14487b574b 100644 --- a/packages/symbolic/Makefile.fpc +++ b/packages/symbolic/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/syslog/Makefile b/packages/syslog/Makefile index 5cd7f89cf1..1287831c5f 100644 --- a/packages/syslog/Makefile +++ b/packages/syslog/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/syslog/Makefile.fpc b/packages/syslog/Makefile.fpc index 59fc9ba8a2..c332a6b4ee 100644 --- a/packages/syslog/Makefile.fpc +++ b/packages/syslog/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/tcl/Makefile b/packages/tcl/Makefile index f097cc5d9a..6327977e51 100644 --- a/packages/tcl/Makefile +++ b/packages/tcl/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/tcl/Makefile.fpc b/packages/tcl/Makefile.fpc index 88314957a9..4694917620 100644 --- a/packages/tcl/Makefile.fpc +++ b/packages/tcl/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/univint/Makefile b/packages/univint/Makefile index 996be7908c..a8d74191f6 100644 --- a/packages/univint/Makefile +++ b/packages/univint/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/univint/Makefile.fpc b/packages/univint/Makefile.fpc index 729baa7d98..88684a69c5 100644 --- a/packages/univint/Makefile.fpc +++ b/packages/univint/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/unixutil/Makefile b/packages/unixutil/Makefile index c6f975af0f..b32941217f 100644 --- a/packages/unixutil/Makefile +++ b/packages/unixutil/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/unixutil/Makefile.fpc b/packages/unixutil/Makefile.fpc index 0e8a99717b..f3062247b7 100644 --- a/packages/unixutil/Makefile.fpc +++ b/packages/unixutil/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/unzip/Makefile b/packages/unzip/Makefile index 7c7c84cb1d..14ac3cd4ed 100644 --- a/packages/unzip/Makefile +++ b/packages/unzip/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/unzip/Makefile.fpc b/packages/unzip/Makefile.fpc index 6fcde9f1bb..91412c2904 100644 --- a/packages/unzip/Makefile.fpc +++ b/packages/unzip/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/users/Makefile b/packages/users/Makefile index 65355e8a69..895dc4f248 100644 --- a/packages/users/Makefile +++ b/packages/users/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/users/Makefile.fpc b/packages/users/Makefile.fpc index 25a322dccd..bb3c113b1c 100644 --- a/packages/users/Makefile.fpc +++ b/packages/users/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/utmp/Makefile b/packages/utmp/Makefile index f792826b56..4df7cb6679 100644 --- a/packages/utmp/Makefile +++ b/packages/utmp/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/utmp/Makefile.fpc b/packages/utmp/Makefile.fpc index d4e34cdbc3..b493cda377 100644 --- a/packages/utmp/Makefile.fpc +++ b/packages/utmp/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/uuid/Makefile b/packages/uuid/Makefile index 9bca3af43e..57104e1002 100644 --- a/packages/uuid/Makefile +++ b/packages/uuid/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/uuid/Makefile.fpc b/packages/uuid/Makefile.fpc index dc683cc306..7af6c719b8 100644 --- a/packages/uuid/Makefile.fpc +++ b/packages/uuid/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/winceunits/Makefile b/packages/winceunits/Makefile index 61cc8f5aba..7ad14b2682 100644 --- a/packages/winceunits/Makefile +++ b/packages/winceunits/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/winceunits/Makefile.fpc b/packages/winceunits/Makefile.fpc index 9fe9dcefd8..89b8232788 100644 --- a/packages/winceunits/Makefile.fpc +++ b/packages/winceunits/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/winunits-base/Makefile b/packages/winunits-base/Makefile index 3194f4b0bd..45f6813c96 100644 --- a/packages/winunits-base/Makefile +++ b/packages/winunits-base/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/winunits-base/Makefile.fpc b/packages/winunits-base/Makefile.fpc index 3bb2ca1983..2973a038c1 100644 --- a/packages/winunits-base/Makefile.fpc +++ b/packages/winunits-base/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/winunits-jedi/Makefile b/packages/winunits-jedi/Makefile index 310e2a444f..5c4d5a6a38 100644 --- a/packages/winunits-jedi/Makefile +++ b/packages/winunits-jedi/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/winunits-jedi/Makefile.fpc b/packages/winunits-jedi/Makefile.fpc index 7d903295c4..e5557b0e46 100644 --- a/packages/winunits-jedi/Makefile.fpc +++ b/packages/winunits-jedi/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/x11/Makefile b/packages/x11/Makefile index e37a0cedfc..0c4fbc6105 100644 --- a/packages/x11/Makefile +++ b/packages/x11/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/x11/Makefile.fpc b/packages/x11/Makefile.fpc index 15e219593f..c7bdf42bc4 100644 --- a/packages/x11/Makefile.fpc +++ b/packages/x11/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/xforms/Makefile b/packages/xforms/Makefile index 3cc1275547..b32e4468f7 100644 --- a/packages/xforms/Makefile +++ b/packages/xforms/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -667,18 +665,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1397,20 +1383,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1713,12 +1685,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2096,96 +2073,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2204,7 +2091,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/xforms/Makefile.fpc b/packages/xforms/Makefile.fpc index c93562d234..fb59445fa7 100644 --- a/packages/xforms/Makefile.fpc +++ b/packages/xforms/Makefile.fpc @@ -36,7 +36,7 @@ endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/zlib/Makefile b/packages/zlib/Makefile index 078b356812..a448085552 100644 --- a/packages/zlib/Makefile +++ b/packages/zlib/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/zlib/Makefile.fpc b/packages/zlib/Makefile.fpc index e8f27830fa..4ace50cd23 100644 --- a/packages/zlib/Makefile.fpc +++ b/packages/zlib/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/zorba/Makefile b/packages/zorba/Makefile index ad735221db..c084ba7800 100644 --- a/packages/zorba/Makefile +++ b/packages/zorba/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,13 +258,11 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif -endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -662,18 +660,6 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1392,20 +1378,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),jvm-java) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1708,12 +1680,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas +endif endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2091,96 +2068,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: @@ -2199,7 +2086,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake diff --git a/packages/zorba/Makefile.fpc b/packages/zorba/Makefile.fpc index 1493e161fa..170806bbe5 100644 --- a/packages/zorba/Makefile.fpc +++ b/packages/zorba/Makefile.fpc @@ -29,7 +29,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake |