From 966f3701b96de2aaa02af0448ead7b5e52afdc69 Mon Sep 17 00:00:00 2001 From: mattias Date: Mon, 9 Aug 2004 14:05:07 +0000 Subject: [PATCH] fixed makefiles git-svn-id: trunk@5756 - --- Makefile | 52 ++++++++++++++++++++++++++++++++++--- Makefile.fpc | 6 ++--- ideintf/Makefile | 61 ++++++++++++++++++++++++++++++++++++++------ ideintf/Makefile.fpc | 1 + packager/Makefile | 2 +- 5 files changed, 106 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index 3374f8f2e1..e63a51329e 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2004/07/25] +# Don't edit, this file is generated by FPCMake Version 1.1 [2004/08/08] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos @@ -233,7 +233,7 @@ endif endif export LAZARUS_CONFIG_DIR LAZARUS_IDE_CONFIG=$(LAZARUS_CONFIG_DIR)/idemake.cfg -override TARGET_DIRS+=lcl components ideintf designer packager +override TARGET_DIRS+=lcl components packager/registration ideintf designer packager override TARGET_PROGRAMS+=lazarus 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)) @@ -2178,6 +2178,7 @@ fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs TARGET_DIRS_LCL=1 TARGET_DIRS_COMPONENTS=1 +TARGET_DIRS_PACKAGER/REGISTRATION=1 TARGET_DIRS_IDEINTF=1 TARGET_DIRS_DESIGNER=1 TARGET_DIRS_PACKAGER=1 @@ -2267,6 +2268,49 @@ components: $(MAKE) -C components all .PHONY: components_all components_debug components_smart components_release components_examples components_shared components_install components_sourceinstall components_exampleinstall components_distinstall components_zipinstall components_zipsourceinstall components_zipexampleinstall components_zipdistinstall components_clean components_distclean components_cleanall components_info components_makefiles components endif +ifdef TARGET_DIRS_PACKAGER/REGISTRATION +packager/registration_all: + $(MAKE) -C packager/registration all +packager/registration_debug: + $(MAKE) -C packager/registration debug +packager/registration_smart: + $(MAKE) -C packager/registration smart +packager/registration_release: + $(MAKE) -C packager/registration release +packager/registration_examples: + $(MAKE) -C packager/registration examples +packager/registration_shared: + $(MAKE) -C packager/registration shared +packager/registration_install: + $(MAKE) -C packager/registration install +packager/registration_sourceinstall: + $(MAKE) -C packager/registration sourceinstall +packager/registration_exampleinstall: + $(MAKE) -C packager/registration exampleinstall +packager/registration_distinstall: + $(MAKE) -C packager/registration distinstall +packager/registration_zipinstall: + $(MAKE) -C packager/registration zipinstall +packager/registration_zipsourceinstall: + $(MAKE) -C packager/registration zipsourceinstall +packager/registration_zipexampleinstall: + $(MAKE) -C packager/registration zipexampleinstall +packager/registration_zipdistinstall: + $(MAKE) -C packager/registration zipdistinstall +packager/registration_clean: + $(MAKE) -C packager/registration clean +packager/registration_distclean: + $(MAKE) -C packager/registration distclean +packager/registration_cleanall: + $(MAKE) -C packager/registration cleanall +packager/registration_info: + $(MAKE) -C packager/registration info +packager/registration_makefiles: + $(MAKE) -C packager/registration makefiles +packager/registration: + $(MAKE) -C packager/registration all +.PHONY: packager/registration_all packager/registration_debug packager/registration_smart packager/registration_release packager/registration_examples packager/registration_shared packager/registration_install packager/registration_sourceinstall packager/registration_exampleinstall packager/registration_distinstall packager/registration_zipinstall packager/registration_zipsourceinstall packager/registration_zipexampleinstall packager/registration_zipdistinstall packager/registration_clean packager/registration_distclean packager/registration_cleanall packager/registration_info packager/registration_makefiles packager/registration +endif ifdef TARGET_DIRS_IDEINTF ideintf_all: $(MAKE) -C ideintf all @@ -2461,7 +2505,7 @@ makefiles: fpc_makefiles ifneq ($(wildcard fpcmake.loc),) include fpcmake.loc endif -.PHONY: lcl components ideintf packager ide idepkg tools all clean cleanide +.PHONY: lcl components packager/registration ideintf packager ide idepkg tools all clean cleanide .SUFFIXES: .rc .res %.res: %.rc windres -i $< -o $@ --preprocessor $(RCPP) @@ -2474,7 +2518,7 @@ idepkg: $(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT='$(OPT) @$(LAZARUS_IDE_CONFIG)' tools: lcl components $(MAKE) -C tools -all: lcl components ideintf designer packager ide +all: lcl components packager/registration ideintf designer packager ide cleanide: $(DEL) $(wildcard *$(OEXT)) $(DEL) $(wildcard *$(PPUEXT)) diff --git a/Makefile.fpc b/Makefile.fpc index a6bf339b93..7348b64517 100644 --- a/Makefile.fpc +++ b/Makefile.fpc @@ -12,7 +12,7 @@ packages=fcl regexpr [target] programs=lazarus -dirs=lcl components ideintf designer packager +dirs=lcl components packager/registration ideintf designer packager exampledirs=examples [compiler] @@ -65,7 +65,7 @@ export LAZARUS_CONFIG_DIR LAZARUS_IDE_CONFIG=$(LAZARUS_CONFIG_DIR)/idemake.cfg [rules] -.PHONY: lcl components ideintf packager ide idepkg tools all clean cleanide +.PHONY: lcl components packager/registration ideintf packager ide idepkg tools all clean cleanide .SUFFIXES: .rc .res %.res: %.rc @@ -83,7 +83,7 @@ idepkg: tools: lcl components $(MAKE) -C tools -all: lcl components ideintf designer packager ide +all: lcl components packager/registration ideintf designer packager ide cleanide: $(DEL) $(wildcard *$(OEXT)) diff --git a/ideintf/Makefile b/ideintf/Makefile index 94438102fb..2f59446a4c 100644 --- a/ideintf/Makefile +++ b/ideintf/Makefile @@ -214,6 +214,7 @@ endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) override PACKAGE_NAME=ideintf override PACKAGE_VERSION=0.9b +override TARGET_DIRS+=../packager/registration override TARGET_UNITS+=allideintf override TARGET_IMPLICITUNITS+=actionseditor columndlg componenteditors componenttreeview graphpropedits idecommands imagelisteditor listviewpropedit objectinspector objinspstrconsts propedits helpintf texttools actionseditor formeditingintf srceditorintf componentreg override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) @@ -2070,22 +2071,66 @@ 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 +TARGET_DIRS_../PACKAGER/REGISTRATION=1 +ifdef TARGET_DIRS_../PACKAGER/REGISTRATION +../packager/registration_all: + $(MAKE) -C ../packager/registration all +../packager/registration_debug: + $(MAKE) -C ../packager/registration debug +../packager/registration_smart: + $(MAKE) -C ../packager/registration smart +../packager/registration_release: + $(MAKE) -C ../packager/registration release +../packager/registration_examples: + $(MAKE) -C ../packager/registration examples +../packager/registration_shared: + $(MAKE) -C ../packager/registration shared +../packager/registration_install: + $(MAKE) -C ../packager/registration install +../packager/registration_sourceinstall: + $(MAKE) -C ../packager/registration sourceinstall +../packager/registration_exampleinstall: + $(MAKE) -C ../packager/registration exampleinstall +../packager/registration_distinstall: + $(MAKE) -C ../packager/registration distinstall +../packager/registration_zipinstall: + $(MAKE) -C ../packager/registration zipinstall +../packager/registration_zipsourceinstall: + $(MAKE) -C ../packager/registration zipsourceinstall +../packager/registration_zipexampleinstall: + $(MAKE) -C ../packager/registration zipexampleinstall +../packager/registration_zipdistinstall: + $(MAKE) -C ../packager/registration zipdistinstall +../packager/registration_clean: + $(MAKE) -C ../packager/registration clean +../packager/registration_distclean: + $(MAKE) -C ../packager/registration distclean +../packager/registration_cleanall: + $(MAKE) -C ../packager/registration cleanall +../packager/registration_info: + $(MAKE) -C ../packager/registration info +../packager/registration_makefiles: + $(MAKE) -C ../packager/registration makefiles +../packager/registration: + $(MAKE) -C ../packager/registration all +.PHONY: ../packager/registration_all ../packager/registration_debug ../packager/registration_smart ../packager/registration_release ../packager/registration_examples ../packager/registration_shared ../packager/registration_install ../packager/registration_sourceinstall ../packager/registration_exampleinstall ../packager/registration_distinstall ../packager/registration_zipinstall ../packager/registration_zipsourceinstall ../packager/registration_zipexampleinstall ../packager/registration_zipdistinstall ../packager/registration_clean ../packager/registration_distclean ../packager/registration_cleanall ../packager/registration_info ../packager/registration_makefiles ../packager/registration +endif debug: fpc_debug smart: fpc_smart release: fpc_release -examples: -shared: -install: fpc_install +examples: $(addsuffix _examples,$(TARGET_DIRS)) +shared: $(addsuffix _shared,$(TARGET_DIRS)) +install: fpc_install $(addsuffix _install,$(TARGET_DIRS)) sourceinstall: fpc_sourceinstall -exampleinstall: fpc_exampleinstall +exampleinstall: fpc_exampleinstall $(addsuffix _exampleinstall,$(TARGET_DIRS)) distinstall: fpc_distinstall zipinstall: fpc_zipinstall zipsourceinstall: fpc_zipsourceinstall -zipexampleinstall: fpc_zipexampleinstall +zipexampleinstall: fpc_zipexampleinstall $(addsuffix _zipexampleinstall,$(TARGET_DIRS)) zipdistinstall: fpc_zipdistinstall -clean: fpc_clean -distclean: fpc_distclean -cleanall: fpc_cleanall +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 examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info makefiles diff --git a/ideintf/Makefile.fpc b/ideintf/Makefile.fpc index 7d739b3515..2e2aa9606e 100644 --- a/ideintf/Makefile.fpc +++ b/ideintf/Makefile.fpc @@ -15,6 +15,7 @@ unittargetdir=units/$(CPU_TARGET)/$(OS_TARGET) options=-gl [target] +dirs=../packager/registration units=allideintf implicitunits=actionseditor \ columndlg \ diff --git a/packager/Makefile b/packager/Makefile index b3f8faa19a..e90c882dc5 100644 --- a/packager/Makefile +++ b/packager/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2004/07/25] +# Don't edit, this file is generated by FPCMake Version 1.1 [2004/08/08] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos