From 915a4b0c8084e6b285691b9dbd905d397ff38429 Mon Sep 17 00:00:00 2001 From: mattias Date: Sun, 16 Jan 2022 22:04:17 +0100 Subject: [PATCH] IDE: fixed compile without duplicates --- Makefile | 1 + Makefile.fpc | 1 + ide/Makefile | 4 ++-- ide/Makefile.fpc | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index aaa791e5f3..8bd7403d04 100644 --- a/Makefile +++ b/Makefile @@ -3759,6 +3759,7 @@ lazbuild: registration $(MAKE) -C components/ideintf LCL_PLATFORM=nogui $(MAKE) -C components/lazdebuggers/cmdlinedebuggerbase LCL_PLATFORM=nogui $(MAKE) -C components/lazdebuggergdbmi LCL_PLATFORM=nogui + $(MAKE) -C ide/packages/idedebugger LCL_PLATFORM=nogui $(MAKE) -C ide lazbuilder LCL_PLATFORM=nogui lhelp: $(MAKE) -C components/chmhelp/lhelp diff --git a/Makefile.fpc b/Makefile.fpc index 8d5fa759ce..e695ab2fb3 100644 --- a/Makefile.fpc +++ b/Makefile.fpc @@ -216,6 +216,7 @@ lazbuild: registration $(MAKE) -C components/ideintf LCL_PLATFORM=nogui $(MAKE) -C components/lazdebuggers/cmdlinedebuggerbase LCL_PLATFORM=nogui $(MAKE) -C components/lazdebuggergdbmi LCL_PLATFORM=nogui + $(MAKE) -C ide/packages/idedebugger LCL_PLATFORM=nogui $(MAKE) -C ide lazbuilder LCL_PLATFORM=nogui #----------------------------------------------------------------------------- diff --git a/ide/Makefile b/ide/Makefile index e99ab59a04..8ea7420a5c 100644 --- a/ide/Makefile +++ b/ide/Makefile @@ -5306,14 +5306,14 @@ endif endif idepackages: $(MAKE) -C packages/idedebugger -ide: $(COMPILER_UNITTARGETDIR) idepackages revisioninc +ide: $(COMPILER_UNITTARGETDIR) revisioninc $(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT='$(DEFAULT_IDE_OPTIONS) $(LAZARUS_OPT) $(OPT)' bigide: $(COMPILER_UNITTARGETDIR) revisioninc -$(DEL) $(COMPILER_UNITTARGETDIR)/pkgmanager$(PPUEXT) $(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT='$(OPT) $(BIG_IDE_OPTIONS)' starter: $(COMPILER_UNITTARGETDIR) $(MAKE) --assume-new=startlazarus.lpr startlazarus$(EXEEXT) OPT='$(DEFAULT_IDE_OPTIONS) $(LAZARUS_OPT) $(OPT)' -lazbuilder: $(COMPILER_UNITTARGETDIR) idepackages +lazbuilder: $(COMPILER_UNITTARGETDIR) $(MAKE) --assume-new=lazbuild.lpr lazbuild$(EXEEXT) OPT='$(DEFAULT_IDE_OPTIONS) $(OPT)' all: ide starter lazbuilder cleanide: diff --git a/ide/Makefile.fpc b/ide/Makefile.fpc index 420e7672ff..d87eeea2fd 100644 --- a/ide/Makefile.fpc +++ b/ide/Makefile.fpc @@ -174,7 +174,7 @@ idepackages: #----------------------------------------------------------------------------- # compile IDE without extra packages -ide: $(COMPILER_UNITTARGETDIR) idepackages revisioninc +ide: $(COMPILER_UNITTARGETDIR) revisioninc $(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT='$(DEFAULT_IDE_OPTIONS) $(LAZARUS_OPT) $(OPT)' #----------------------------------------------------------------------------- @@ -188,7 +188,7 @@ starter: $(COMPILER_UNITTARGETDIR) $(MAKE) --assume-new=startlazarus.lpr startlazarus$(EXEEXT) OPT='$(DEFAULT_IDE_OPTIONS) $(LAZARUS_OPT) $(OPT)' #----------------------------------------------------------------------------- -lazbuilder: $(COMPILER_UNITTARGETDIR) idepackages +lazbuilder: $(COMPILER_UNITTARGETDIR) $(MAKE) --assume-new=lazbuild.lpr lazbuild$(EXEEXT) OPT='$(DEFAULT_IDE_OPTIONS) $(OPT)' #-----------------------------------------------------------------------------