paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-21 14:19:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: fixed compile without duplicates

Browse Source
This commit is contained in:
mattias 2022-01-16 22:04:17 +01:00
parent e24d4bded5
commit 915a4b0c80
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -3759,6 +3759,7 @@ lazbuild: registration
$(MAKE) -C components/ideintf LCL_PLATFORM=nogui $(MAKE) -C components/ideintf LCL_PLATFORM=nogui
$(MAKE) -C components/lazdebuggers/cmdlinedebuggerbase LCL_PLATFORM=nogui $(MAKE) -C components/lazdebuggers/cmdlinedebuggerbase LCL_PLATFORM=nogui
$(MAKE) -C components/lazdebuggergdbmi 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 $(MAKE) -C ide lazbuilder LCL_PLATFORM=nogui
lhelp: lhelp:
$(MAKE) -C components/chmhelp/lhelp $(MAKE) -C components/chmhelp/lhelp

1
Makefile.fpc
View File

@ -216,6 +216,7 @@ lazbuild: registration
$(MAKE) -C components/ideintf LCL_PLATFORM=nogui $(MAKE) -C components/ideintf LCL_PLATFORM=nogui
$(MAKE) -C components/lazdebuggers/cmdlinedebuggerbase LCL_PLATFORM=nogui $(MAKE) -C components/lazdebuggers/cmdlinedebuggerbase LCL_PLATFORM=nogui
$(MAKE) -C components/lazdebuggergdbmi 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 $(MAKE) -C ide lazbuilder LCL_PLATFORM=nogui
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------

4
ide/Makefile
View File

@ -5306,14 +5306,14 @@ endif
endif endif
idepackages: idepackages:
$(MAKE) -C packages/idedebugger $(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)' $(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT='$(DEFAULT_IDE_OPTIONS) $(LAZARUS_OPT) $(OPT)'
bigide: $(COMPILER_UNITTARGETDIR) revisioninc bigide: $(COMPILER_UNITTARGETDIR) revisioninc
-$(DEL) $(COMPILER_UNITTARGETDIR)/pkgmanager$(PPUEXT) -$(DEL) $(COMPILER_UNITTARGETDIR)/pkgmanager$(PPUEXT)
$(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT='$(OPT) $(BIG_IDE_OPTIONS)' $(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT='$(OPT) $(BIG_IDE_OPTIONS)'
starter: $(COMPILER_UNITTARGETDIR) starter: $(COMPILER_UNITTARGETDIR)
$(MAKE) --assume-new=startlazarus.lpr startlazarus$(EXEEXT) OPT='$(DEFAULT_IDE_OPTIONS) $(LAZARUS_OPT) $(OPT)' $(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)' $(MAKE) --assume-new=lazbuild.lpr lazbuild$(EXEEXT) OPT='$(DEFAULT_IDE_OPTIONS) $(OPT)'
all: ide starter lazbuilder all: ide starter lazbuilder
cleanide: cleanide:

4
ide/Makefile.fpc
View File

@ -174,7 +174,7 @@ idepackages:
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# compile IDE without extra packages # 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)' $(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)' $(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)' $(MAKE) --assume-new=lazbuild.lpr lazbuild$(EXEEXT) OPT='$(DEFAULT_IDE_OPTIONS) $(OPT)'
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------