From 2473867d22557929ee0b06e07f7845660a84c842 Mon Sep 17 00:00:00 2001 From: mattias Date: Wed, 14 Mar 2012 13:09:44 +0000 Subject: [PATCH] lcl: added make help, make intf, make cleanintf, make cleanall git-svn-id: trunk@35976 - --- lcl/Makefile | 120 ++++++++++++++++++++++++++++++++--------------- lcl/Makefile.fpc | 40 ++++++++++++++-- 2 files changed, 120 insertions(+), 40 deletions(-) diff --git a/lcl/Makefile b/lcl/Makefile index 52c3745f22..1fd36b1432 100644 --- a/lcl/Makefile +++ b/lcl/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/10/17] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/03/14] # 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 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 +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga 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-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 mips-linux mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -152,12 +152,6 @@ ifdef OS_TARGET_DEFAULT OS_TARGET=$(OS_TARGET_DEFAULT) endif endif -ifneq ($(words $(FPC_COMPILERINFO)),5) -FPC_COMPILERINFO+=$(shell $(FPC) -iSP) -FPC_COMPILERINFO+=$(shell $(FPC) -iTP) -FPC_COMPILERINFO+=$(shell $(FPC) -iSO) -FPC_COMPILERINFO+=$(shell $(FPC) -iTO) -endif ifndef CPU_SOURCE CPU_SOURCE:=$(word 2,$(FPC_COMPILERINFO)) endif @@ -493,6 +487,9 @@ endif ifeq ($(FULL_TARGET),armeb-embedded) override TARGET_DIRS+=interfaces endif +ifeq ($(FULL_TARGET),mips-linux) +override TARGET_DIRS+=interfaces +endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_DIRS+=interfaces endif @@ -682,6 +679,9 @@ endif ifeq ($(FULL_TARGET),armeb-embedded) override TARGET_UNITS+=alllclunits endif +ifeq ($(FULL_TARGET),mips-linux) +override TARGET_UNITS+=alllclunits +endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=alllclunits endif @@ -871,6 +871,9 @@ endif ifeq ($(FULL_TARGET),armeb-embedded) override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage endif +ifeq ($(FULL_TARGET),mips-linux) +override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage +endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage endif @@ -1060,6 +1063,9 @@ endif ifeq ($(FULL_TARGET),armeb-embedded) override TARGET_RSTS+=lclstrconsts endif +ifeq ($(FULL_TARGET),mips-linux) +override TARGET_RSTS+=lclstrconsts +endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_RSTS+=lclstrconsts endif @@ -1249,6 +1255,9 @@ endif ifeq ($(FULL_TARGET),armeb-embedded) override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard ./units/*$(OEXT)) $(wildcard ./units/*$(PPUEXT)) $(wildcard ./units/*$(RSTEXT)) $(wildcard widgetset/*$(OEXT)) $(wildcard widgetset/*$(PPUEXT)) $(wildcard widgetset/*$(RSTEXT))$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) endif +ifeq ($(FULL_TARGET),mips-linux) +override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard ./units/*$(OEXT)) $(wildcard ./units/*$(PPUEXT)) $(wildcard ./units/*$(RSTEXT)) $(wildcard widgetset/*$(OEXT)) $(wildcard widgetset/*$(PPUEXT)) $(wildcard widgetset/*$(RSTEXT))$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) +endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard ./units/*$(OEXT)) $(wildcard ./units/*$(PPUEXT)) $(wildcard ./units/*$(RSTEXT)) $(wildcard widgetset/*$(OEXT)) $(wildcard widgetset/*$(PPUEXT)) $(wildcard widgetset/*$(RSTEXT))$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) endif @@ -1438,6 +1447,9 @@ endif ifeq ($(FULL_TARGET),armeb-embedded) override COMPILER_OPTIONS+=-gl $(LCL_DISABLE_CHECKS) endif +ifeq ($(FULL_TARGET),mips-linux) +override COMPILER_OPTIONS+=-gl $(LCL_DISABLE_CHECKS) +endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-gl $(LCL_DISABLE_CHECKS) endif @@ -1627,6 +1639,9 @@ endif ifeq ($(FULL_TARGET),armeb-embedded) override COMPILER_INCLUDEDIR+=include endif +ifeq ($(FULL_TARGET),mips-linux) +override COMPILER_INCLUDEDIR+=include +endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=include endif @@ -1816,6 +1831,9 @@ endif ifeq ($(FULL_TARGET),armeb-embedded) override COMPILER_UNITDIR+=../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) . $(NONWIN32) forms widgetset endif +ifeq ($(FULL_TARGET),mips-linux) +override COMPILER_UNITDIR+=../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) . $(NONWIN32) forms widgetset +endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_UNITDIR+=../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) . $(NONWIN32) forms widgetset endif @@ -2005,6 +2023,9 @@ endif ifeq ($(FULL_TARGET),armeb-embedded) override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET) endif +ifeq ($(FULL_TARGET),mips-linux) +override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET) +endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET) endif @@ -2218,6 +2239,7 @@ SHAREDLIBPREFIX=libfp STATICLIBPREFIX=libp IMPORTLIBPREFIX=libimp RSTEXT=.rst +EXEDBGEXT=.dbg ifeq ($(OS_TARGET),go32v1) STATICLIBPREFIX= SHORTSUFFIX=v1 @@ -2339,6 +2361,7 @@ BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 SHORTSUFFIX=dwn +EXEDBGEXT=.dSYM endif ifeq ($(OS_TARGET),gba) EXEEXT=.gba @@ -2590,25 +2613,6 @@ DATESTR:=$(shell $(DATE) +%Y%m%d) else DATESTR= endif -ifndef UPXPROG -ifeq ($(OS_TARGET),go32v2) -UPXPROG:=1 -endif -ifeq ($(OS_TARGET),win32) -UPXPROG:=1 -endif -ifdef UPXPROG -UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH)))) -ifeq ($(UPXPROG),) -UPXPROG= -else -UPXPROG:=$(firstword $(UPXPROG)) -endif -else -UPXPROG= -endif -endif -export UPXPROG ZIPOPT=-9 ZIPEXT=.zip ifeq ($(USETAR),bz2) @@ -2805,6 +2809,9 @@ endif ifeq ($(FULL_TARGET),armeb-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),mips-linux) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -2857,6 +2864,7 @@ override FPCOPT+=-P$(ARCH) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) +override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) @@ -2866,6 +2874,11 @@ ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) endif endif +ifndef CROSSCOMPILE +ifneq ($(BINUTILSPREFIX),) +override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif @@ -2957,7 +2970,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifneq ($(findstring $(OS_TARGET),linux solaris),) +ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -3109,9 +3122,6 @@ endif fpc_install: all $(INSTALLTARGET) ifdef INSTALLEXEFILES $(MKDIR) $(INSTALL_BINDIR) -ifdef UPXPROG - -$(UPXPROG) $(INSTALLEXEFILES) -endif $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR) endif ifdef INSTALL_CREATEPACKAGEFPC @@ -3245,9 +3255,11 @@ fpc_zipdistinstall: .PHONY: fpc_clean fpc_cleanall fpc_distclean ifdef EXEFILES override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES)) +override CLEANEXEDBGFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEDBGFILES)) endif ifdef CLEAN_PROGRAMS override CLEANEXEFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix $(EXEEXT), $(CLEAN_PROGRAMS))) +override CLEANEXEDBGFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix $(EXEDBGEXT), $(CLEAN_PROGRAMS))) endif ifdef CLEAN_UNITS override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS)) @@ -3264,6 +3276,9 @@ fpc_clean: $(CLEANTARGET) ifdef CLEANEXEFILES -$(DEL) $(CLEANEXEFILES) endif +ifdef CLEANEXEDBGFILES + -$(DELTREE) $(CLEANEXEDBGFILES) +endif ifdef CLEANPPUFILES -$(DEL) $(CLEANPPUFILES) endif @@ -3365,7 +3380,6 @@ fpc_baseinfo: @$(ECHO) Date...... $(DATE) @$(ECHO) FPCMake... $(FPCMAKE) @$(ECHO) PPUMove... $(PPUMOVE) - @$(ECHO) Upx....... $(UPXPROG) @$(ECHO) Zip....... $(ZIPPROG) @$(ECHO) @$(ECHO) == Object info == @@ -3608,6 +3622,9 @@ endif ifeq ($(FULL_TARGET),armeb-embedded) TARGET_DIRS_INTERFACES=1 endif +ifeq ($(FULL_TARGET),mips-linux) +TARGET_DIRS_INTERFACES=1 +endif ifeq ($(FULL_TARGET),mipsel-linux) TARGET_DIRS_INTERFACES=1 endif @@ -3672,20 +3689,49 @@ zipexampleinstall: fpc_zipexampleinstall $(addsuffix _zipexampleinstall,$(TARGET zipdistinstall: fpc_zipdistinstall clean: fpc_clean $(addsuffix _clean,$(TARGET_DIRS)) distclean: fpc_distclean $(addsuffix _distclean,$(TARGET_DIRS)) -cleanall: fpc_cleanall $(addsuffix _cleanall,$(TARGET_DIRS)) info: fpc_info makefiles: fpc_makefiles -.PHONY: debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info makefiles +.PHONY: debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean info makefiles ifneq ($(wildcard fpcmake.loc),) include fpcmake.loc endif -.PHONY: cleartarget compiled all cleanlaz +.PHONY: help cleartarget lclbase compiled all intf cleanintf cleanlaz cleanall +help: + @$(ECHO) + @$(ECHO) " Important: the LCL requires components/lazutils and packager/registration" + @$(ECHO) + @$(ECHO) " Targets" + @$(ECHO) " all build lclbase and one interface" + @$(ECHO) " clean deletes files that 'all' creates" + @$(ECHO) " lclbase build lclbase" + @$(ECHO) " intf build one lcl interface, selectable via LCL_PLATFORM" + @$(ECHO) " cleanintf delete files that 'intf' creates" + @$(ECHO) " cleanall as 'clean' plus clean for all common interfaces." + @$(ECHO) " Does not clean up cross compiled interfaces." + @$(ECHO) + @$(ECHO) " Examples:" + @$(ECHO) + @$(ECHO) " Compile the lcl with the default interface:" + @$(ECHO) " make clean all" + @$(ECHO) + @$(ECHO) " Compile the interface for the qt widgetset:" + @$(ECHO) " make cleanintf intf LCL_PLATFORM=qt" + @$(ECHO) + @$(ECHO) "Clean up:" + @$(ECHO) " There is no command to clean up all interfaces." + @$(ECHO) " In most cases it is enough to delete the 'units' directory." + @$(ECHO) cleartarget: -$(DEL) $(COMPILER_UNITTARGETDIR)/alllclunits$(PPUEXT) +lclbase: cleartarget $(COMPILER_UNITTARGETDIR) alllclunits$(PPUEXT) compiled compiled: $(COPY) Makefile.compiled $(COMPILER_UNITTARGETDIR)/LCLBase.compiled -all: cleartarget $(COMPILER_UNITTARGETDIR) alllclunits$(PPUEXT) $(TARGET_DIRS) compiled -cleanlaz: clean +intf: $(TARGET_DIRS) +cleanintf: + $(MAKE) -C interfaces clean +all: lclbase compiled intf +cleanlaz: cleanall +cleanall: clean $(MAKE) -C interfaces clean $(MAKE) -C interfaces/carbon clean $(MAKE) -C interfaces/fpgui clean diff --git a/lcl/Makefile.fpc b/lcl/Makefile.fpc index 471fabfcd3..6abe61e68e 100644 --- a/lcl/Makefile.fpc +++ b/lcl/Makefile.fpc @@ -107,17 +107,51 @@ files=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) \ lcldir=. [rules] -.PHONY: cleartarget compiled all cleanlaz +.PHONY: help cleartarget lclbase compiled all intf cleanintf cleanlaz cleanall + +help: + @$(ECHO) + @$(ECHO) " Important: the LCL requires components/lazutils and packager/registration" + @$(ECHO) + @$(ECHO) " Targets" + @$(ECHO) " all build lclbase and one interface" + @$(ECHO) " clean deletes files that 'all' creates" + @$(ECHO) " lclbase build lclbase" + @$(ECHO) " intf build one lcl interface, selectable via LCL_PLATFORM" + @$(ECHO) " cleanintf delete files that 'intf' creates" + @$(ECHO) " cleanall as 'clean' plus clean for all common interfaces." + @$(ECHO) " Does not clean up cross compiled interfaces." + @$(ECHO) + @$(ECHO) " Examples:" + @$(ECHO) + @$(ECHO) " Compile the lcl with the default interface:" + @$(ECHO) " make clean all" + @$(ECHO) + @$(ECHO) " Compile the interface for the qt widgetset:" + @$(ECHO) " make cleanintf intf LCL_PLATFORM=qt" + @$(ECHO) + @$(ECHO) "Clean up:" + @$(ECHO) " There is no command to clean up all interfaces." + @$(ECHO) " In most cases it is enough to delete the 'units' directory." + @$(ECHO) cleartarget: -$(DEL) $(COMPILER_UNITTARGETDIR)/alllclunits$(PPUEXT) +lclbase: cleartarget $(COMPILER_UNITTARGETDIR) alllclunits$(PPUEXT) compiled + compiled: $(COPY) Makefile.compiled $(COMPILER_UNITTARGETDIR)/LCLBase.compiled -all: cleartarget $(COMPILER_UNITTARGETDIR) alllclunits$(PPUEXT) $(TARGET_DIRS) compiled +intf: $(TARGET_DIRS) -cleanlaz: clean +cleanintf: + $(MAKE) -C interfaces clean + +all: lclbase compiled intf + +cleanlaz: cleanall +cleanall: clean $(MAKE) -C interfaces clean $(MAKE) -C interfaces/carbon clean $(MAKE) -C interfaces/fpgui clean