summaryrefslogtreecommitdiff
path: root/installer
diff options
context:
space:
mode:
authorpierre <pierre@3ad0048d-3df7-0310-abae-a5850022a9f2>2009-12-10 11:25:32 +0000
committerpierre <pierre@3ad0048d-3df7-0310-abae-a5850022a9f2>2009-12-10 11:25:32 +0000
commit419d147455238f3cd64bf81af79b92543d153355 (patch)
tree341126f5cfeb35a57af1e3605d8172d6b4143662 /installer
parentc54e19a489c97317ac1fe648ce3ae5cb8e77590e (diff)
downloadfpc-419d147455238f3cd64bf81af79b92543d153355.tar.gz
* update Makefile
git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@14386 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'installer')
-rw-r--r--installer/Makefile40
1 files changed, 34 insertions, 6 deletions
diff --git a/installer/Makefile b/installer/Makefile
index ae10148ad9..d171ca56a9 100644
--- a/installer/Makefile
+++ b/installer/Makefile
@@ -1,10 +1,10 @@
#
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2009/08/02]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2009/12/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 m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
+MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux
BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) solaris qnx
+UNIXs = linux $(BSDs) solaris qnx haiku
LIMIT83fs = go32v2 os2 emx watcom
OSNeedsComspecToRunBatch = go32v2 watcom
FORCE:
@@ -299,6 +299,9 @@ endif
ifeq ($(FULL_TARGET),armeb-linux)
override TARGET_PROGRAMS+=installer writeidx
endif
+ifeq ($(FULL_TARGET),mipsel-linux)
+override TARGET_PROGRAMS+=installer writeidx
+endif
ifeq ($(FULL_TARGET),i386-linux)
override CLEAN_UNITS+=scroll insthelp
endif
@@ -422,6 +425,9 @@ endif
ifeq ($(FULL_TARGET),x86_64-freebsd)
override CLEAN_UNITS+=scroll insthelp
endif
+ifeq ($(FULL_TARGET),x86_64-solaris)
+override CLEAN_UNITS+=scroll insthelp
+endif
ifeq ($(FULL_TARGET),x86_64-darwin)
override CLEAN_UNITS+=scroll insthelp
endif
@@ -473,6 +479,9 @@ endif
ifeq ($(FULL_TARGET),armeb-embedded)
override CLEAN_UNITS+=scroll insthelp
endif
+ifeq ($(FULL_TARGET),mipsel-linux)
+override CLEAN_UNITS+=scroll insthelp
+endif
ifeq ($(FULL_TARGET),i386-linux)
override CLEAN_FILES+=installer.pas
endif
@@ -497,6 +506,9 @@ endif
ifeq ($(FULL_TARGET),armeb-linux)
override CLEAN_FILES+=installer.pas
endif
+ifeq ($(FULL_TARGET),mipsel-linux)
+override CLEAN_FILES+=installer.pas
+endif
override INSTALL_FPCPACKAGE=y
ifeq ($(FULL_TARGET),i386-linux)
override COMPILER_UNITDIR+=../ide
@@ -621,6 +633,9 @@ endif
ifeq ($(FULL_TARGET),x86_64-freebsd)
override COMPILER_UNITDIR+=../ide
endif
+ifeq ($(FULL_TARGET),x86_64-solaris)
+override COMPILER_UNITDIR+=../ide
+endif
ifeq ($(FULL_TARGET),x86_64-darwin)
override COMPILER_UNITDIR+=../ide
endif
@@ -672,6 +687,9 @@ endif
ifeq ($(FULL_TARGET),armeb-embedded)
override COMPILER_UNITDIR+=../ide
endif
+ifeq ($(FULL_TARGET),mipsel-linux)
+override COMPILER_UNITDIR+=../ide
+endif
ifdef REQUIRE_UNITSDIR
override UNITSDIR+=$(REQUIRE_UNITSDIR)
endif
@@ -1644,6 +1662,11 @@ REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_FV=1
REQUIRE_PACKAGES_UNZIP=1
endif
+ifeq ($(FULL_TARGET),x86_64-solaris)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FV=1
+REQUIRE_PACKAGES_UNZIP=1
+endif
ifeq ($(FULL_TARGET),x86_64-darwin)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_FV=1
@@ -1729,6 +1752,11 @@ REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_FV=1
REQUIRE_PACKAGES_UNZIP=1
endif
+ifeq ($(FULL_TARGET),mipsel-linux)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FV=1
+REQUIRE_PACKAGES_UNZIP=1
+endif
ifdef REQUIRE_PACKAGES_RTL
PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
ifneq ($(PACKAGEDIR_RTL),)
@@ -1738,9 +1766,9 @@ else
UNITDIR_RTL=$(PACKAGEDIR_RTL)
endif
ifdef CHECKDEPEND
-$(PACKAGEDIR_RTL)/$(FPCMADE):
- $(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+$(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE):
+ $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE)
endif
else
PACKAGEDIR_RTL=