From f6e9182888f4434d7747086952dc4a236f15eea1 Mon Sep 17 00:00:00 2001 From: martin Date: Sun, 26 Aug 2012 15:10:01 +0000 Subject: [PATCH] Installer, SynEdit: moved registration to separate package (makefiles) git-svn-id: trunk@38391 - --- components/Makefile | 2 ++ components/Makefile.fpc | 2 ++ ide/Makefile | 3 ++- ide/Makefile.fpc | 3 ++- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/components/Makefile b/components/Makefile index 3f90ad3920..eb7112c66a 100644 --- a/components/Makefile +++ b/components/Makefile @@ -1508,11 +1508,13 @@ bigide: $(MAKE) -C externhelp $(MAKE) -C tdbf $(MAKE) -C sqldb + $(MAKE) -C synedit/design all: bigide clean: $(MAKE) -C lazutils clean $(MAKE) -C codetools clean $(MAKE) -C synedit clean + $(MAKE) -C synedit/design clean $(MAKE) -C lazcontrols clean $(MAKE) -C rtticontrols clean $(MAKE) -C printers clean diff --git a/components/Makefile.fpc b/components/Makefile.fpc index 14bd11cfc3..315b1387c6 100644 --- a/components/Makefile.fpc +++ b/components/Makefile.fpc @@ -61,6 +61,7 @@ bigide: $(MAKE) -C externhelp $(MAKE) -C tdbf $(MAKE) -C sqldb + $(MAKE) -C synedit/design all: bigide @@ -68,6 +69,7 @@ clean: $(MAKE) -C lazutils clean $(MAKE) -C codetools clean $(MAKE) -C synedit clean + $(MAKE) -C synedit/design clean $(MAKE) -C lazcontrols clean $(MAKE) -C rtticontrols clean $(MAKE) -C printers clean diff --git a/ide/Makefile b/ide/Makefile index d8ef251aef..3507ccfee1 100644 --- a/ide/Makefile +++ b/ide/Makefile @@ -336,7 +336,8 @@ BIG_IDE_OPTIONS=-dBigIDE $(DEFAULT_IDE_OPTIONS) \ -Fu../components/chmhelp/packages/help/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) \ -Fu../components/chmhelp/packages/idehelp/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) \ -Fu../components/instantfpc/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) \ - -Fu../components/externhelp/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) + -Fu../components/externhelp/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) \ + -Fu../components/synedit/design/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) LAZBUILD_OPT=$(LAZARUS_LIBPATHS) ifneq ($(findstring $(OS_TARGET),win32 win64),) LAZARUS_OPT+= -WG diff --git a/ide/Makefile.fpc b/ide/Makefile.fpc index f7e6e7b6b5..014db0d940 100644 --- a/ide/Makefile.fpc +++ b/ide/Makefile.fpc @@ -114,7 +114,8 @@ BIG_IDE_OPTIONS=-dBigIDE $(DEFAULT_IDE_OPTIONS) \ -Fu../components/chmhelp/packages/help/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) \ -Fu../components/chmhelp/packages/idehelp/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) \ -Fu../components/instantfpc/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) \ - -Fu../components/externhelp/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) + -Fu../components/externhelp/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) \ + -Fu../components/synedit/design/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) # # Options for compiling lazbuild