fixed typo in Makefile

git-svn-id: trunk@40480 -
This commit is contained in:
mattias 2013-03-04 09:47:24 +00:00
parent f27ebb416f
commit 77f4a8780b
2 changed files with 10 additions and 198 deletions

206
Makefile
View File

@ -1,10 +1,10 @@
#
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/09/18]
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/02/25]
#
default: all
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_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 haiku aix
UNIXs = linux $(BSDs) solaris qnx haiku
LIMIT83fs = go32v2 os2 emx watcom
OSNeedsComspecToRunBatch = go32v2 watcom
FORCE:
@ -177,12 +177,6 @@ else
ARCH=$(CPU_TARGET)
endif
endif
ifeq ($(FULL_TARGET),arm-embedded)
ifeq ($(SUBARCH),)
$(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t or SUBARCH=armv7m) must be defined)
endif
override FPCOPT+=-Cp$(SUBARCH)
endif
ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
TARGETSUFFIX=$(OS_TARGET)
SOURCESUFFIX=$(OS_SOURCE)
@ -208,14 +202,6 @@ endif
ifeq ($(OS_TARGET),linux)
linuxHier=1
endif
ifndef CROSSCOMPILE
BUILDFULLNATIVE=1
export BUILDFULLNATIVE
endif
ifdef BUILDFULLNATIVE
BUILDNATIVE=1
export BUILDNATIVE
endif
export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE
ifdef FPCDIR
override FPCDIR:=$(subst \,/,$(FPCDIR))
@ -265,13 +251,11 @@ ifndef BINUTILSPREFIX
ifndef CROSSBINDIR
ifdef CROSSCOMPILE
ifndef DARWIN2DARWIN
ifneq ($(CPU_TARGET),jvm)
BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)-
endif
endif
endif
endif
endif
UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX))
ifeq ($(UNITSDIR),)
UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
@ -431,9 +415,6 @@ endif
ifeq ($(FULL_TARGET),powerpc-wii)
override TARGET_PROGRAMS+=lazarus startlazarus lazbuild
endif
ifeq ($(FULL_TARGET),powerpc-aix)
override TARGET_PROGRAMS+=lazarus startlazarus lazbuild
endif
ifeq ($(FULL_TARGET),sparc-linux)
override TARGET_PROGRAMS+=lazarus startlazarus lazbuild
endif
@ -503,9 +484,6 @@ endif
ifeq ($(FULL_TARGET),powerpc64-embedded)
override TARGET_PROGRAMS+=lazarus startlazarus lazbuild
endif
ifeq ($(FULL_TARGET),powerpc64-aix)
override TARGET_PROGRAMS+=lazarus startlazarus lazbuild
endif
ifeq ($(FULL_TARGET),avr-embedded)
override TARGET_PROGRAMS+=lazarus startlazarus lazbuild
endif
@ -515,18 +493,9 @@ endif
ifeq ($(FULL_TARGET),armeb-embedded)
override TARGET_PROGRAMS+=lazarus startlazarus lazbuild
endif
ifeq ($(FULL_TARGET),mips-linux)
override TARGET_PROGRAMS+=lazarus startlazarus lazbuild
endif
ifeq ($(FULL_TARGET),mipsel-linux)
override TARGET_PROGRAMS+=lazarus startlazarus lazbuild
endif
ifeq ($(FULL_TARGET),jvm-java)
override TARGET_PROGRAMS+=lazarus startlazarus lazbuild
endif
ifeq ($(FULL_TARGET),jvm-android)
override TARGET_PROGRAMS+=lazarus startlazarus lazbuild
endif
ifeq ($(FULL_TARGET),i386-linux)
override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) $(wildcard *.lfm)
endif
@ -641,9 +610,6 @@ endif
ifeq ($(FULL_TARGET),powerpc-wii)
override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) $(wildcard *.lfm)
endif
ifeq ($(FULL_TARGET),powerpc-aix)
override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) $(wildcard *.lfm)
endif
ifeq ($(FULL_TARGET),sparc-linux)
override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) $(wildcard *.lfm)
endif
@ -713,9 +679,6 @@ endif
ifeq ($(FULL_TARGET),powerpc64-embedded)
override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) $(wildcard *.lfm)
endif
ifeq ($(FULL_TARGET),powerpc64-aix)
override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) $(wildcard *.lfm)
endif
ifeq ($(FULL_TARGET),avr-embedded)
override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) $(wildcard *.lfm)
endif
@ -725,18 +688,9 @@ endif
ifeq ($(FULL_TARGET),armeb-embedded)
override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) $(wildcard *.lfm)
endif
ifeq ($(FULL_TARGET),mips-linux)
override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) $(wildcard *.lfm)
endif
ifeq ($(FULL_TARGET),mipsel-linux)
override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) $(wildcard *.lfm)
endif
ifeq ($(FULL_TARGET),jvm-java)
override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) $(wildcard *.lfm)
endif
ifeq ($(FULL_TARGET),jvm-android)
override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) $(wildcard *.lfm)
endif
override INSTALL_BASEDIR=share/lazarus
override INSTALL_FPCPACKAGE=n
override DIST_DESTDIR=$(BASEDIR)/dist
@ -1092,23 +1046,6 @@ EXEEXT=.dol
SHAREDLIBEXT=.so
SHORTSUFFIX=wii
endif
ifeq ($(OS_TARGET),aix)
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)
@ -1655,14 +1592,6 @@ REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_FPMKUNIT=1
REQUIRE_PACKAGES_REGEXPR=1
endif
ifeq ($(FULL_TARGET),powerpc-aix)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_FCL-PROCESS=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_FPMKUNIT=1
REQUIRE_PACKAGES_REGEXPR=1
endif
ifeq ($(FULL_TARGET),sparc-linux)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PASZLIB=1
@ -1847,14 +1776,6 @@ REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_FPMKUNIT=1
REQUIRE_PACKAGES_REGEXPR=1
endif
ifeq ($(FULL_TARGET),powerpc64-aix)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_FCL-PROCESS=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_FPMKUNIT=1
REQUIRE_PACKAGES_REGEXPR=1
endif
ifeq ($(FULL_TARGET),avr-embedded)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PASZLIB=1
@ -1879,14 +1800,6 @@ REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_FPMKUNIT=1
REQUIRE_PACKAGES_REGEXPR=1
endif
ifeq ($(FULL_TARGET),mips-linux)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_FCL-PROCESS=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_FPMKUNIT=1
REQUIRE_PACKAGES_REGEXPR=1
endif
ifeq ($(FULL_TARGET),mipsel-linux)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PASZLIB=1
@ -1895,22 +1808,6 @@ REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_FPMKUNIT=1
REQUIRE_PACKAGES_REGEXPR=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
REQUIRE_PACKAGES_REGEXPR=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
REQUIRE_PACKAGES_REGEXPR=1
endif
ifdef REQUIRE_PACKAGES_RTL
PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
ifneq ($(PACKAGEDIR_RTL),)
@ -2251,12 +2148,17 @@ endif
endif
ifdef CREATESHARED
override FPCOPT+=-Cg
ifeq ($(CPU_TARGET),i386)
override FPCOPT+=-Aas
endif
endif
ifeq ($(findstring 2.0.,$(FPC_VERSION)),)
ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),)
ifeq ($(CPU_TARGET),x86_64)
override FPCOPT+=-Cg
endif
endif
endif
ifdef LINKSHARED
endif
ifdef OPT
@ -2727,96 +2629,6 @@ endif
fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS))
fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2
fpc_makefiles: fpc_makefile fpc_makefile_dirs
ifdef TARGET_DIRS_TARGET_DIRS
TARGET_DIRS_all:
$(MAKE) -C TARGET_DIRS all
TARGET_DIRS_debug:
$(MAKE) -C TARGET_DIRS debug
TARGET_DIRS_smart:
$(MAKE) -C TARGET_DIRS smart
TARGET_DIRS_release:
$(MAKE) -C TARGET_DIRS release
TARGET_DIRS_units:
$(MAKE) -C TARGET_DIRS units
TARGET_DIRS_examples:
$(MAKE) -C TARGET_DIRS examples
TARGET_DIRS_shared:
$(MAKE) -C TARGET_DIRS shared
TARGET_DIRS_install:
$(MAKE) -C TARGET_DIRS install
TARGET_DIRS_sourceinstall:
$(MAKE) -C TARGET_DIRS sourceinstall
TARGET_DIRS_exampleinstall:
$(MAKE) -C TARGET_DIRS exampleinstall
TARGET_DIRS_distinstall:
$(MAKE) -C TARGET_DIRS distinstall
TARGET_DIRS_zipinstall:
$(MAKE) -C TARGET_DIRS zipinstall
TARGET_DIRS_zipsourceinstall:
$(MAKE) -C TARGET_DIRS zipsourceinstall
TARGET_DIRS_zipexampleinstall:
$(MAKE) -C TARGET_DIRS zipexampleinstall
TARGET_DIRS_zipdistinstall:
$(MAKE) -C TARGET_DIRS zipdistinstall
TARGET_DIRS_clean:
$(MAKE) -C TARGET_DIRS clean
TARGET_DIRS_distclean:
$(MAKE) -C TARGET_DIRS distclean
TARGET_DIRS_cleanall:
$(MAKE) -C TARGET_DIRS cleanall
TARGET_DIRS_info:
$(MAKE) -C TARGET_DIRS info
TARGET_DIRS_makefiles:
$(MAKE) -C TARGET_DIRS makefiles
TARGET_DIRS:
$(MAKE) -C TARGET_DIRS all
.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS
endif
ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS
TARGET_EXAMPLEDIRS_all:
$(MAKE) -C TARGET_EXAMPLEDIRS all
TARGET_EXAMPLEDIRS_debug:
$(MAKE) -C TARGET_EXAMPLEDIRS debug
TARGET_EXAMPLEDIRS_smart:
$(MAKE) -C TARGET_EXAMPLEDIRS smart
TARGET_EXAMPLEDIRS_release:
$(MAKE) -C TARGET_EXAMPLEDIRS release
TARGET_EXAMPLEDIRS_units:
$(MAKE) -C TARGET_EXAMPLEDIRS units
TARGET_EXAMPLEDIRS_examples:
$(MAKE) -C TARGET_EXAMPLEDIRS examples
TARGET_EXAMPLEDIRS_shared:
$(MAKE) -C TARGET_EXAMPLEDIRS shared
TARGET_EXAMPLEDIRS_install:
$(MAKE) -C TARGET_EXAMPLEDIRS install
TARGET_EXAMPLEDIRS_sourceinstall:
$(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall
TARGET_EXAMPLEDIRS_exampleinstall:
$(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall
TARGET_EXAMPLEDIRS_distinstall:
$(MAKE) -C TARGET_EXAMPLEDIRS distinstall
TARGET_EXAMPLEDIRS_zipinstall:
$(MAKE) -C TARGET_EXAMPLEDIRS zipinstall
TARGET_EXAMPLEDIRS_zipsourceinstall:
$(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall
TARGET_EXAMPLEDIRS_zipexampleinstall:
$(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall
TARGET_EXAMPLEDIRS_zipdistinstall:
$(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall
TARGET_EXAMPLEDIRS_clean:
$(MAKE) -C TARGET_EXAMPLEDIRS clean
TARGET_EXAMPLEDIRS_distclean:
$(MAKE) -C TARGET_EXAMPLEDIRS distclean
TARGET_EXAMPLEDIRS_cleanall:
$(MAKE) -C TARGET_EXAMPLEDIRS cleanall
TARGET_EXAMPLEDIRS_info:
$(MAKE) -C TARGET_EXAMPLEDIRS info
TARGET_EXAMPLEDIRS_makefiles:
$(MAKE) -C TARGET_EXAMPLEDIRS makefiles
TARGET_EXAMPLEDIRS:
$(MAKE) -C TARGET_EXAMPLEDIRS all
.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS
endif
debug: fpc_debug
smart: fpc_smart
release: fpc_release
@ -2844,7 +2656,7 @@ help:
@$(ECHO) " all build minimal IDE, lazbuild, startlazarus."
@$(ECHO) " clean deletes files that 'all' creates"
@$(ECHO) " lazbuild build lazbuild and lcl with nogui widgetset"
@$(ECHO) " bigide as all, except that the IDE is build with a lot of extra packages"
@$(ECHO) " bigide as all, except that the IDE is built with a lot of extra packages"
@$(ECHO) " useride calls lazbuild to build an IDE with your active profile, requires lazbuild"
@$(ECHO) " install installs Lazarus under $(LAZARUS_INSTALL_DIR)"
@$(ECHO) " You can change the directory by appending INSTALL_PREFIX=/some/path"

View File

@ -54,7 +54,7 @@ help:
@$(ECHO) " all build minimal IDE, lazbuild, startlazarus."
@$(ECHO) " clean deletes files that 'all' creates"
@$(ECHO) " lazbuild build lazbuild and lcl with nogui widgetset"
@$(ECHO) " bigide as all, except that the IDE is build with a lot of extra packages"
@$(ECHO) " bigide as all, except that the IDE is built with a lot of extra packages"
@$(ECHO) " useride calls lazbuild to build an IDE with your active profile, requires lazbuild"
@$(ECHO) " install installs Lazarus under $(LAZARUS_INSTALL_DIR)"
@$(ECHO) " You can change the directory by appending INSTALL_PREFIX=/some/path"