From a7995e2442d124c2d8937f4ca6ee374e2cc99397 Mon Sep 17 00:00:00 2001 From: vincents Date: Fri, 27 Aug 2004 18:12:06 +0000 Subject: [PATCH] added starter as makefile target, hand edited the Makefile to support .lpr files git-svn-id: trunk@5873 - --- Makefile | 18 ++++++++++-------- Makefile.fpc | 9 ++++++--- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 89ab3c33e4..e52056b211 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2004/08/15] +# Don't edit, this file is generated by FPCMake Version 1.1 [2004/08/13] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos @@ -238,7 +238,7 @@ export LAZARUS_CONFIG_DIR LAZARUS_IDE_CONFIG=$(LAZARUS_CONFIG_DIR)/idemake.cfg LAZARUS_OPT=$(LAZARUS_LIBPATHS) override TARGET_DIRS+=lcl components packager/registration ideintf designer packager -override TARGET_PROGRAMS+=lazarus +override TARGET_PROGRAMS+=lazarus startlazarus override TARGET_EXAMPLEDIRS+=examples override CLEAN_FILES+=$(wildcard ./designer/*$(OEXT)) $(wildcard ./designer/*$(PPUEXT)) $(wildcard ./debugger/*$(OEXT)) $(wildcard ./debugger/*$(PPUEXT)) $(wildcard ./packager/*$(OEXT)) $(wildcard ./packager/*$(PPUEXT)) $(wildcard ./doceditor/*$(OEXT)) $(wildcard ./doceditor/*$(PPUEXT)) override INSTALL_BASEDIR=share/lazarus @@ -1832,7 +1832,7 @@ endif .PHONY: fpc_examples ifneq ($(TARGET_EXAMPLES),) HASEXAMPLES=1 -override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)) $(addsuffix .dpr,$(TARGET_EXAMPLES))) +override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)) $(addsuffix .lpr,$(TARGET_EXAMPLES))) override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES)) override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES))) override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES) @@ -1857,7 +1857,7 @@ fpc_debug: $(MAKE) all DEBUG=1 fpc_release: $(MAKE) all RELEASE=1 -.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .dpr .pp .rc .res +.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .pp .rc .res %$(PPUEXT): %.pp $(COMPILER) $< $(EXECPPAS) @@ -1870,14 +1870,14 @@ fpc_release: %$(EXEEXT): %.pas $(COMPILER) $< $(EXECPPAS) -%$(EXEEXT): %.dpr +%$(EXEEXT): %.lpr $(COMPILER) $< $(EXECPPAS) %.res: %.rc windres -i $< -o $@ vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR) vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR) -vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR) +vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR) vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR) .PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall ifdef INSTALL_UNITS @@ -2509,7 +2509,7 @@ makefiles: fpc_makefiles ifneq ($(wildcard fpcmake.loc),) include fpcmake.loc endif -.PHONY: lcl components packager/registration ideintf packager ide idepkg tools all clean cleanide purge +.PHONY: lcl components packager/registration ideintf packager ide idepkg starter tools all clean cleanide purge .SUFFIXES: .rc .res %.res: %.rc windres -i $< -o $@ --preprocessor $(RCPP) @@ -2524,9 +2524,11 @@ else endif idepkg: $(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT='$(OPT) $(LAZARUS_OPT) @$(LAZARUS_IDE_CONFIG)' +starter: lcl + $(MAKE) startlazarus$(EXEEXT) tools: lcl components $(MAKE) -C tools -all: lcl components packager/registration ideintf designer packager ide +all: lcl components packager/registration ideintf designer packager ide starter cleanide: $(DEL) $(wildcard *$(OEXT)) $(DEL) $(wildcard *$(PPUEXT)) diff --git a/Makefile.fpc b/Makefile.fpc index 2bebf0bcc7..5086afa6d4 100644 --- a/Makefile.fpc +++ b/Makefile.fpc @@ -11,7 +11,7 @@ packages=fcl regexpr # Adding lcl codetools synedit, adds the source paths. [target] -programs=lazarus +programs=lazarus startlazarus dirs=lcl components packager/registration ideintf designer packager exampledirs=examples @@ -70,7 +70,7 @@ LAZARUS_IDE_CONFIG=$(LAZARUS_CONFIG_DIR)/idemake.cfg LAZARUS_OPT=$(LAZARUS_LIBPATHS) [rules] -.PHONY: lcl components packager/registration ideintf packager ide idepkg tools all clean cleanide purge +.PHONY: lcl components packager/registration ideintf packager ide idepkg starter tools all clean cleanide purge .SUFFIXES: .rc .res %.res: %.rc @@ -89,10 +89,13 @@ endif idepkg: $(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT='$(OPT) $(LAZARUS_OPT) @$(LAZARUS_IDE_CONFIG)' +starter: lcl + $(MAKE) startlazarus$(EXEEXT) + tools: lcl components $(MAKE) -C tools -all: lcl components packager/registration ideintf designer packager ide +all: lcl components packager/registration ideintf designer packager ide starter cleanide: $(DEL) $(wildcard *$(OEXT))