paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-18 07:29:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed ideintf hard dependency on pkg intf

Browse Source 
git-svn-id: trunk@6024 -
This commit is contained in:
mattias 2004-09-18 10:13:58 +00:00
parent 5b73c01f75
commit a73fcef8dd
3 changed files with 18 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ide/buildlazdialog.pas
View File

@ -34,10 +34,10 @@ unit BuildLazDialog;
interface
uses
Classes, SysUtils, Math, Forms, Controls, LCLType, LCLIntf, Graphics,
GraphType, StdCtrls, ExtCtrls, Buttons, FileCtrl, Dialogs, LResources,
Laz_XMLCfg, LazarusIDEStrConsts, TransferMacros, LazConf, IDEProcs,
InputHistory, ExtToolDialog, ExtToolEditDlg, CompilerOptions;
Classes, SysUtils, Math, LCLProc, Forms, Controls, LCLType, LCLIntf,
Graphics, GraphType, StdCtrls, ExtCtrls, Buttons, FileCtrl, Dialogs,
LResources, Laz_XMLCfg, LazarusIDEStrConsts, TransferMacros, LazConf,
IDEProcs, InputHistory, ExtToolDialog, ExtToolEditDlg, CompilerOptions;
type
{ TBuildLazarusItem }
@ -103,9 +103,9 @@ type
FItemJITForm: TBuildLazarusItem;
FItemLCL: TBuildLazarusItem;
FItemPkgReg: TBuildLazarusItem;
{$IFDEF UseStartLazarus}
{$IFDEF UseStartLazarus}
FItemStarter: TBuildLazarusItem;
{$ENDIF}
{$ENDIF}
FItemSynEdit: TBuildLazarusItem;
fExtraOptions: string;
FTargetDirectory: string;
@ -146,7 +146,6 @@ type
{$ENDIF}
property ItemExamples: TBuildLazarusItem read FItemExamples;
property CleanAll: boolean read fCleanAll write fCleanAll;
//property MakeFilename: string read fMakeFilename write fMakeFilename;
property ExtraOptions: string read fExtraOptions write fExtraOptions;
property TargetOS: string read fTargetOS write SetTargetOS;
property LCLPlatform: TLCLPlatform read fLCLPlatform write fLCLPlatform;
@ -761,6 +760,8 @@ begin
LCLInterfaceRadioGroup.ItemIndex:=ord(Options.LCLPlatform);
WithStaticPackagesCheckBox.Checked:=Options.WithStaticPackages;
TargetOSEdit.Text:=Options.TargetOS;
Invalidate;
end;
procedure TConfigureBuildLazarusDlg.Save(DestOptions: TBuildLazarusOptions);

69
ideintf/Makefile
View File

@ -1,5 +1,5 @@
#
# Don't edit, this file is generated by FPCMake Version 1.1 [2004/08/29]
# 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
@ -214,7 +214,6 @@ 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 componentreg componenttreeview configstorage formeditingintf graphpropedits helpfpdoc helphtml helpintf idecommands imagelisteditor listviewpropedit objectinspector objinspstrconsts projectintf propedits srceditorintf texttools
override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT))
@ -1763,7 +1762,7 @@ fpc_debug:
$(MAKE) all DEBUG=1
fpc_release:
$(MAKE) all RELEASE=1
.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res
.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .dpr .pp .rc .res
%$(PPUEXT): %.pp
$(COMPILER) $<
$(EXECPPAS)
@ -1776,9 +1775,6 @@ fpc_release:
%$(EXEEXT): %.pas
$(COMPILER) $<
$(EXECPPAS)
%$(EXEEXT): %.lpr
$(COMPILER) $<
$(EXECPPAS)
%$(EXEEXT): %.dpr
$(COMPILER) $<
$(EXECPPAS)
@ -1786,7 +1782,6 @@ fpc_release:
windres -i $< -o $@
vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall
@ -2090,66 +2085,22 @@ 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: $(addsuffix _examples,$(TARGET_DIRS))
shared: $(addsuffix _shared,$(TARGET_DIRS))
install: fpc_install $(addsuffix _install,$(TARGET_DIRS))
examples:
shared:
install: fpc_install
sourceinstall: fpc_sourceinstall
exampleinstall: fpc_exampleinstall $(addsuffix _exampleinstall,$(TARGET_DIRS))
exampleinstall: fpc_exampleinstall
distinstall: fpc_distinstall
zipinstall: fpc_zipinstall
zipsourceinstall: fpc_zipsourceinstall
zipexampleinstall: fpc_zipexampleinstall $(addsuffix _zipexampleinstall,$(TARGET_DIRS))
zipexampleinstall: fpc_zipexampleinstall
zipdistinstall: fpc_zipdistinstall
clean: fpc_clean $(addsuffix _clean,$(TARGET_DIRS))
distclean: fpc_distclean $(addsuffix _distclean,$(TARGET_DIRS))
cleanall: fpc_cleanall $(addsuffix _cleanall,$(TARGET_DIRS))
clean: fpc_clean
distclean: fpc_distclean
cleanall: fpc_cleanall
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

1
ideintf/Makefile.fpc
View File

@ -15,7 +15,6 @@ unittargetdir=units/$(CPU_TARGET)/$(OS_TARGET)
options=-gl
[target]
dirs=../packager/registration
units=allideintf
implicitunits=actionseditor \
columndlg \