From 364f0cd3188086b3644a6806a6568aca2d9214ab Mon Sep 17 00:00:00 2001 From: mattias Date: Wed, 14 Mar 2012 13:10:26 +0000 Subject: [PATCH] fixed make lazbuild, cleaned up makefile git-svn-id: trunk@35977 - --- Makefile | 28 +++++++++++++++------------- Makefile.fpc | 26 ++++++++++++++------------ ide/Makefile | 33 +++++++++++++++++++++++++++++++-- 3 files changed, 60 insertions(+), 27 deletions(-) diff --git a/Makefile b/Makefile index c28896a7f3..fbfb959019 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/03/07] +# 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 mips-linux mipsel-linux @@ -3845,7 +3845,7 @@ makefiles: fpc_makefiles ifneq ($(wildcard fpcmake.loc),) include fpcmake.loc endif -.PHONY: help lcl components packager/registration ideintf bigidecomponents ide idepkg idebig bigide starter lazbuilder tools all clean cleanide cleannogui purge examples install lazbuild +.PHONY: help lcl components packager/registration ideintf bigidecomponents ide idepkg idebig bigide starter lazbuild tools all clean cleanide cleannogui purge examples install help: @$(ECHO) @$(ECHO) " Targets" @@ -3885,12 +3885,11 @@ help: @exit ide: $(MAKE) -C ide ide -lazutils: - $(MAKE) -C packager/registration +lazutils: packager/registration $(MAKE) -C components/lazutils idepkg: $(MAKE) -C ide idepkg -bigide: packager/registration lazutils lcl ideintf bigidecomponents idebig starter lazbuilder +bigide: lazbuild lcl ideintf bigidecomponents idebig starter idebig: $(MAKE) -C ide bigide bigidecomponents: @@ -3899,20 +3898,23 @@ bigideclean: cleanlaz $(MAKE) -C components bigideclean starter: $(MAKE) -C ide starter -lazbuild: lazbuilder -lazbuilder: - $(MAKE) -C lcl/interfaces/nogui +lazbuild: lazutils + $(MAKE) -C components/codetools + $(MAKE) -C lcl lclbase intf LCL_PLATFORM=nogui + $(MAKE) -C ideintf all LCL_PLATFORM=nogui + $(MAKE) -C components/synedit all LCL_PLATFORM=nogui + $(MAKE) -C components/lazcontrols all LCL_PLATFORM=nogui $(MAKE) -C ide lazbuilder LCL_PLATFORM=nogui tools: lcl $(MAKE) -C tools -examples: lcl components -all: packager/registration lazutils lcl ideintf components ide starter lazbuilder +examples: lcl bigidecomponents +all: lazbuild lcl ideintf components ide starter cleannogui: - $(MAKE) -C lcl/interfaces/nogui clean LCL_PLATFORM=nogui + $(MAKE) -C lcl cleanintf LCL_PLATFORM=nogui cleanide: $(MAKE) -C ide cleanide -cleanlaz: cleanide cleannogui - $(MAKE) -C lcl clean +cleanlaz: cleanide + $(MAKE) -C lcl cleanall $(MAKE) -C components clean $(MAKE) -C packager/registration clean $(MAKE) -C ideintf clean diff --git a/Makefile.fpc b/Makefile.fpc index fe711e7b11..847adff99c 100644 --- a/Makefile.fpc +++ b/Makefile.fpc @@ -45,7 +45,7 @@ endif #----------------------------------------------------------------------------- [rules] -.PHONY: help lcl components packager/registration ideintf bigidecomponents ide idepkg idebig bigide starter lazbuilder tools all clean cleanide cleannogui purge examples install lazbuild +.PHONY: help lcl components packager/registration ideintf bigidecomponents ide idepkg idebig bigide starter lazbuild tools all clean cleanide cleannogui purge examples install #----------------------------------------------------------------------------- help: @@ -91,8 +91,7 @@ ide: $(MAKE) -C ide ide #----------------------------------------------------------------------------- -lazutils: - $(MAKE) -C packager/registration +lazutils: packager/registration $(MAKE) -C components/lazutils #----------------------------------------------------------------------------- @@ -100,7 +99,7 @@ idepkg: $(MAKE) -C ide idepkg #----------------------------------------------------------------------------- -bigide: packager/registration lazutils lcl ideintf bigidecomponents idebig starter lazbuilder +bigide: lazbuild lcl ideintf bigidecomponents idebig starter #----------------------------------------------------------------------------- idebig: @@ -119,9 +118,12 @@ starter: $(MAKE) -C ide starter #----------------------------------------------------------------------------- -lazbuild: lazbuilder -lazbuilder: - $(MAKE) -C lcl/interfaces/nogui +lazbuild: lazutils + $(MAKE) -C components/codetools + $(MAKE) -C lcl lclbase intf LCL_PLATFORM=nogui + $(MAKE) -C ideintf all LCL_PLATFORM=nogui + $(MAKE) -C components/synedit all LCL_PLATFORM=nogui + $(MAKE) -C components/lazcontrols all LCL_PLATFORM=nogui $(MAKE) -C ide lazbuilder LCL_PLATFORM=nogui #----------------------------------------------------------------------------- @@ -129,20 +131,20 @@ tools: lcl $(MAKE) -C tools #----------------------------------------------------------------------------- -examples: lcl components +examples: lcl bigidecomponents #----------------------------------------------------------------------------- -all: packager/registration lazutils lcl ideintf components ide starter lazbuilder +all: lazbuild lcl ideintf components ide starter #----------------------------------------------------------------------------- cleannogui: - $(MAKE) -C lcl/interfaces/nogui clean LCL_PLATFORM=nogui + $(MAKE) -C lcl cleanintf LCL_PLATFORM=nogui cleanide: $(MAKE) -C ide cleanide -cleanlaz: cleanide cleannogui - $(MAKE) -C lcl clean +cleanlaz: cleanide + $(MAKE) -C lcl cleanall $(MAKE) -C components clean $(MAKE) -C packager/registration clean $(MAKE) -C ideintf clean diff --git a/ide/Makefile b/ide/Makefile index 17c50a8c0d..d2d20c6ea5 100644 --- a/ide/Makefile +++ b/ide/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/01/23] +# 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 @@ -533,6 +533,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 @@ -722,6 +725,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)/*.or) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard ../designer/*$(OEXT)) $(wildcard ../designer/*$(PPUEXT)) $(wildcard ../debugger/*$(OEXT)) $(wildcard ../debugger/*$(PPUEXT)) $(wildcard ../converter/*$(OEXT)) $(wildcard ../converter/*$(PPUEXT)) $(wildcard ../packager/*$(OEXT)) $(wildcard ../packager/*$(PPUEXT)) $(wildcard ../*$(OEXT)) $(wildcard ../*$(PPUEXT)) $(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)/*.or) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard ../designer/*$(OEXT)) $(wildcard ../designer/*$(PPUEXT)) $(wildcard ../debugger/*$(OEXT)) $(wildcard ../debugger/*$(PPUEXT)) $(wildcard ../converter/*$(OEXT)) $(wildcard ../converter/*$(PPUEXT)) $(wildcard ../packager/*$(OEXT)) $(wildcard ../packager/*$(PPUEXT)) $(wildcard ../*$(OEXT)) $(wildcard ../*$(PPUEXT)) $(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)/*.or) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard ../designer/*$(OEXT)) $(wildcard ../designer/*$(PPUEXT)) $(wildcard ../debugger/*$(OEXT)) $(wildcard ../debugger/*$(PPUEXT)) $(wildcard ../converter/*$(OEXT)) $(wildcard ../converter/*$(PPUEXT)) $(wildcard ../packager/*$(OEXT)) $(wildcard ../packager/*$(PPUEXT)) $(wildcard ../*$(OEXT)) $(wildcard ../*$(PPUEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) endif @@ -914,6 +920,9 @@ endif ifeq ($(FULL_TARGET),armeb-embedded) override COMPILER_OPTIONS+=-gl -dlcl$(LCL_PLATFORM) endif +ifeq ($(FULL_TARGET),mips-linux) +override COMPILER_OPTIONS+=-gl -dlcl$(LCL_PLATFORM) +endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-gl -dlcl$(LCL_PLATFORM) endif @@ -1103,6 +1112,9 @@ endif ifeq ($(FULL_TARGET),armeb-embedded) override COMPILER_INCLUDEDIR+=include include/$(OS_TARGET) ../images endif +ifeq ($(FULL_TARGET),mips-linux) +override COMPILER_INCLUDEDIR+=include include/$(OS_TARGET) ../images +endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=include include/$(OS_TARGET) ../images endif @@ -1292,6 +1304,9 @@ endif ifeq ($(FULL_TARGET),armeb-embedded) override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET) ../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../components/custom ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../designer ../debugger ../debugger/frames ../converter ../packager ../packager/frames ../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../units/$(CPU_TARGET)-$(OS_TARGET) frames . endif +ifeq ($(FULL_TARGET),mips-linux) +override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET) ../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../components/custom ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../designer ../debugger ../debugger/frames ../converter ../packager ../packager/frames ../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../units/$(CPU_TARGET)-$(OS_TARGET) frames . +endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET) ../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../components/custom ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../designer ../debugger ../debugger/frames ../converter ../packager ../packager/frames ../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../units/$(CPU_TARGET)-$(OS_TARGET) frames . endif @@ -1481,6 +1496,9 @@ endif ifeq ($(FULL_TARGET),armeb-embedded) override COMPILER_TARGETDIR+=.. endif +ifeq ($(FULL_TARGET),mips-linux) +override COMPILER_TARGETDIR+=.. +endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_TARGETDIR+=.. endif @@ -1670,6 +1688,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 @@ -2794,6 +2815,14 @@ 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