diff options
230 files changed, 13998 insertions, 1037 deletions
diff --git a/packages/Makefile b/packages/Makefile index 9fe55dcdf0..223987ab56 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -677,6 +679,18 @@ 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) @@ -1123,6 +1137,12 @@ 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),) @@ -1273,17 +1293,12 @@ 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 @@ -1508,6 +1523,96 @@ 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: @@ -1538,7 +1643,7 @@ FPMAKE_OPT+=-bu fpmkunit_bootstrap: $(MAKE) -C fpmkunit bootstrap fpmake: fpmake.pp fpmkunit_bootstrap - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 4544cfd0da..2fa6c71a9e 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 2a41eb4084..c5d7b7d43b 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 8227412922..31357a3bbd 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 3564ff6644..da7de1ee41 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 8a9ad6432c..fd5791530a 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 85edd6dafe..5adef9328d 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 5fe39ae68e..b1a4ee465e 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 6a07e02247..c5b0402834 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 d79379d49e..9c17643346 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 a4f1b3730d..dfc9d7a39d 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 5fa5cc1e12..c7ca848f99 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 e5c153fc03..0ba7b02e77 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 c4c8e17b1d..3f84e076c5 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 062952dbc4..da28052e79 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 3a12e54a71..ba5b21bf03 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 96ed469e40..80c1afc7e4 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -665,6 +667,18 @@ 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) @@ -1383,6 +1397,20 @@ 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),) @@ -1685,17 +1713,12 @@ 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 @@ -2073,6 +2096,96 @@ 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: @@ -2091,7 +2204,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 592626e48c..ae6b15b3cb 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 47f3c9bd82..0db4f2552d 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 230e628322..5780868152 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 b940725aef..1680301c9d 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 542eddad17..8c9ab93090 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 98659be526..42d9c8dc61 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 d7e7f9f595..0e6d58cf1b 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 d256e7627a..0923a13817 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 6c2be43766..ec544448d7 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 3bfabaf744..a71307d277 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 7c62f51d6f..93737ac9c9 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 6583360a25..32b4ebd8c5 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 19b027259c..8026c248d1 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 fe99c3687c..699d7652ce 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 ef9bb8d06a..0260a338e8 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 9c7fa9449e..9f42ddbf69 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 0db65b3a0f..90d59def03 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 c83716935d..befa722e7f 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 3fb177ce01..c7865dfc51 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 fc026d4a5f..0ae664e823 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 d86e7642bd..e3e1a97e39 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 2dc4b96480..4cdaef641b 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 4d008c2bdd..2e033db538 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 2a080c2f1c..0d7fee5852 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 4c398958a0..b49b5d5f60 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 36c7de9ac3..af7be18b60 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 e9be854bf8..93488406e9 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 0acef97aa0..140f77db68 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 5a57cefd87..5e1969f672 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 6eb9552a00..017f157011 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 41aab81f0c..7fdcbb8ebc 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 c8ec51d839..b89d8e90b3 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -684,6 +686,18 @@ 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) @@ -1130,6 +1144,12 @@ 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),) @@ -1280,17 +1300,12 @@ 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 @@ -1668,6 +1683,96 @@ 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: @@ -1686,7 +1791,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 0b0716905b..2db11ea432 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 47fb1e4a67..d7a91c7dab 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 82d5472fca..4e40aae995 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 937cfdfa08..3448f0a595 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 8bdea90ff8..eb1bb3d6bb 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 e999b8a3ee..24b8a24101 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 f2ccba93de..d0d25b03c2 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 c5537cf851..fd3cbcb757 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 97b75ff5c5..4ce18199a3 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 a50d02b143..07f100e0f9 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 f4ad0e2d8f..ab561acf49 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 7591e530ef..50e3380f5b 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 35c2d69671..fb5f9fe359 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 3eaaf35573..5ce177012e 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 e63bf59141..741fe548a3 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 6360198b2c..bdaf4a00d9 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 0faf5af34f..6f91620554 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 8f828f4393..9e0920d0c5 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -693,6 +695,18 @@ 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) @@ -1343,6 +1357,18 @@ 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),) @@ -1607,17 +1633,12 @@ 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 @@ -1995,6 +2016,96 @@ 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: @@ -2015,9 +2126,9 @@ endif $(TARGET_UNITDIRBS): $(MKDIRTREE) $(TARGET_UNITDIRBS) bootstrap: $(TARGET_UNITDIRBS) - $(FPCFPMAKE) src/fpmkunit.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) -FU$(TARGET_UNITDIRBS) $(UNIT_ZIPPER) $(UNIT_PROCESS) + $(FPCFPMAKE) src/fpmkunit.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) -FU$(TARGET_UNITDIRBS) $(UNIT_ZIPPER) $(UNIT_PROCESS) fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(UNITDIR_FPMAKE_RTL)) $(FPCMAKEOPT) -Fu$(TARGET_UNITDIRBS) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 ad331b701b..68c7fabe44 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) -FU$(TARGET_UNITDIRBS) $(UNIT_ZIPPER) $(UNIT_PROCESS) + $(FPCFPMAKE) src/fpmkunit.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) -FU$(TARGET_UNITDIRBS) $(UNIT_ZIPPER) $(UNIT_PROCESS) fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(UNITDIR_FPMAKE_RTL)) $(FPCMAKEOPT) -Fu$(TARGET_UNITDIRBS) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 9b3b0c39b2..55cdf3123f 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 5f68db8a1d..3bc93ab74e 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 203d7dc007..6f29fbd9c3 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 dd1442e50b..229d92e98b 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 04fd1bb0b4..5b1c849da8 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 3896b5d109..ff6fdcd082 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 e4c08b3109..677c8486ea 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2088,7 +2201,7 @@ override FPCOPT:=$(filter-out -FU%,$(FPCOPT)) override FPCOPT:=$(filter-out -FE%,$(FPCOPT)) .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 3539b87e89..5f41ac5a0d 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 689b5b0cdd..f00329655d 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 9c9fd70d22..84bc2334e5 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 25f2ab6bc6..3bd014c222 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 9de0094380..aaf93308b9 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 1271175a72..1531ae1bed 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 d9f4b5bbbe..a1989e70a4 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 89084762a1..54116f297e 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 a65e0ffcf4..4f6890a0eb 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 3b9b6ddc1f..336a092020 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 18572cfa87..8b1b60a219 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 3ab82c4e61..c2c90302aa 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 ca47ff3f59..a58805b4be 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 0ef63f7560..d5571392ac 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 7dd9456177..6b2742af4a 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 bdeb64e60b..cafbd3a7d2 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -684,6 +686,18 @@ 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) @@ -1130,6 +1144,12 @@ 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),) @@ -1280,17 +1300,12 @@ 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 @@ -1668,6 +1683,96 @@ 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: @@ -1686,7 +1791,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 d47fa24e8e..5dca40023d 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 944228939a..5a1cfe6988 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 15dac9a6ac..f185b63c87 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 349e59178a..31f1809701 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 12e0212ab1..1fed2845b7 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 905d777f35..51150f792e 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 141c8d3d68..070553cb9d 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 000f670a0d..158b5b9f61 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 4f3b3b577f..296c6aeb4a 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 aaee03af43..dc06e6ceba 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 a409db842d..3b1d233b0a 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 3f6297b964..595440f908 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 5cfb0b8a68..d460948805 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 a859c0e62a..7787517e25 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 12aeb7fea1..00ae508df3 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 524204804f..48097b619a 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 2425ce77c9..d037c03c90 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 82512abe0b..7563cfc84f 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 33437ed864..baf3b068c6 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 6e9acfc090..abe90a197a 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 311d676e86..ec4d10b9e8 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 d2f69d6f59..bd8b7eb1b2 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 ca018af401..eb55c0b077 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 e86aeb73f0..4239660e2c 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 3fd6d807c8..cf76fadee3 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 9df1a0d844..a44ec5cf7b 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 d2420bed04..15c39ca02e 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 7e5571068d..3fee8851ae 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 a8207adcc8..891004b684 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 d9b3a458d7..9b97d3a8e8 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 ac071a850c..ac9de536ca 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 3b3dab3384..3f325591b7 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 0bc07b22f1..77dd5928f7 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 b43bbe2999..26094ffccc 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 435f8390b7..afcbeb35d3 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 8250554fd7..57332416af 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 b66b381e9b..0a4811eac0 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 5539cc3997..6fc69857e6 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 6ae5ae2631..d7a3135c3d 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 79eca410e1..d4979d6f7a 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 54b556400e..096915de5f 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 10ad0f7adf..664baca807 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 f40080c253..ecc1294cf9 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 7520214b17..de3973c9e0 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 c30ab77fa6..7c4d010512 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 553f87274f..a0b25389ba 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 35bed04305..a1ebc57e85 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 48e0887038..af740d13bd 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 3bddabe888..b13950e16b 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 cc24a5d8fb..359b9cc712 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 aeadcc9ee2..12b28ce116 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 610161e9c1..95ae4ce5e8 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 c5bf376d31..8a47aa7578 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 faf65e77a9..116eed9608 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 b53a887af3..001b680755 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 f3c3a46491..187c0fd62c 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 4bed212d2a..4d62654c31 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 43ab625fe8..350e23f1db 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 59656beccf..4d1a171c57 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 a58dbe2089..712f9a601b 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 7c404b1e57..fbca5ffd89 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 af90479b84..f5e9594ce8 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 4ab667f7ef..042e2e0b07 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 f3f84b16ed..fec00741f2 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 0c5edd8ee5..47fbc65e76 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 1d7b9d996e..cd07095721 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 9e914b0a67..a25f947a22 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 5483fa1b61..345f528a4d 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 05a7def4b6..43e0be8d9a 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 066242f699..c791de5d8e 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 f670cb0385..96eaf3a8cf 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 056c41730f..db764ec8ef 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 c07cd4bbd4..d3137c8cb6 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 048da5bd92..d5ca586525 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 ad753445b0..7238d15e53 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 c3c548e442..3aae19fa91 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 614e295d84..dd84c11465 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 ef16033dc4..96ef72a03f 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 23caf86cdb..1922f62350 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 b895fc5869..ac0a3dfe91 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 0328dd5781..3d8d19c98d 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 f9fd95d96a..547abcffbf 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -684,6 +686,18 @@ 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) @@ -1130,6 +1144,12 @@ 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),) @@ -1280,17 +1300,12 @@ 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 @@ -1668,6 +1683,96 @@ 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: @@ -1686,7 +1791,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 e446374462..ad1edfe14b 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 964a648588..c463a950d9 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 0d8dadbde6..76d60fd776 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 62ac3697b1..d7cb0ccf99 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 a29f40c751..14519142c0 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 9fc7563bfb..3827897404 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 df43e84277..f5ea789c4f 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 7183178d6e..4b457a84f6 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 4b0183c164..66eac218eb 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 7b06cc6671..3bffa1168b 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 ab7c02ddac..b92918936d 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 99b6f0e9d7..6dfefc914b 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 e57654b65b..6a290f594c 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 5230cfdef5..32b6331eb9 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 29c1fcf60e..6138512790 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 330035a1c2..68a46f87e7 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 9a51c82b06..4a9be7a8e6 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 8e4df89adc..63e0ce6807 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 dc034a181e..39b5fdc40e 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 6ed45215b3..11edf43e72 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 ea32dc437c..295e8e3a56 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 97f01bbe28..d831d5c64f 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 f606a5ff86..23fd47b660 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 09122b2078..e8952d874e 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 a43c4bf1ad..5bb3bbffa3 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 4f2cc18c27..50728b88f4 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 14487b574b..3b8db955cb 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 1287831c5f..5cd7f89cf1 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 c332a6b4ee..59fc9ba8a2 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 6327977e51..f097cc5d9a 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 4694917620..88314957a9 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 a8d74191f6..996be7908c 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 88684a69c5..729baa7d98 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 b32941217f..c6f975af0f 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 f3062247b7..0e8a99717b 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 14ac3cd4ed..7c7c84cb1d 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 91412c2904..6fcde9f1bb 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 895dc4f248..65355e8a69 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 bb3c113b1c..25a322dccd 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 4df7cb6679..f792826b56 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 b493cda377..d4e34cdbc3 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 57104e1002..9bca3af43e 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 7af6c719b8..dc683cc306 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 7ad14b2682..61cc8f5aba 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 89b8232788..9fe9dcefd8 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 45f6813c96..3194f4b0bd 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 2973a038c1..3bb2ca1983 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 5c4d5a6a38..310e2a444f 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 e5557b0e46..7d903295c4 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 0c4fbc6105..e37a0cedfc 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 c7bdf42bc4..15e219593f 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 b32e4468f7..3cc1275547 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -665,6 +667,18 @@ 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) @@ -1383,6 +1397,20 @@ 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),) @@ -1685,17 +1713,12 @@ 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 @@ -2073,6 +2096,96 @@ 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: @@ -2091,7 +2204,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 fb59445fa7..c93562d234 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 a448085552..078b356812 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 4ace50cd23..e8f27830fa 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 c084ba7800..ad735221db 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/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/10] # 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 +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom @@ -258,11 +258,13 @@ 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)) @@ -660,6 +662,18 @@ 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) @@ -1378,6 +1392,20 @@ 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),) @@ -1680,17 +1708,12 @@ 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 @@ -2068,6 +2091,96 @@ 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: @@ -2086,7 +2199,7 @@ include fpcmake.loc endif .NOTPARALLEL: fpmake: fpmake.pp - $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(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 170806bbe5..1493e161fa 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) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(FPCOPT) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) all: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu smart: fpmake |