splitted ide Makefile.fpc ide/Makefile.fpc

git-svn-id: trunk@7447 -

.gitattributes

@@ -744,6 +744,8 @@ examples/turbopower_ipro/mainunit.pas svneol=native#text/pascal
 examples/turbopower_ipro/simplepage2.html svneol=native#text/html
 examples/turbopower_ipro/tpiproexample.lpi svneol=native#text/plain
 examples/turbopower_ipro/tpiproexample.lpr svneol=native#text/pascal
+ide/Makefile svneol=native#text/plain
+ide/Makefile.fpc svneol=native#text/plain
 ide/aboutfrm.lfm svneol=native#text/plain
 ide/aboutfrm.lrs svneol=native#text/pascal
 ide/aboutfrm.pas svneol=native#text/pascal

Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/05/08]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/05/09]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
@@ -232,31 +232,6 @@ PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/ext
 override PACKAGE_NAME=lazarus
 override PACKAGE_VERSION=0.9b
 RCPP?=$(strip $(firstword cpp$(SRCEXEEXT)))
-ifndef LCL_PLATFORM
-ifeq ($(OS_TARGET),win32)
-LCL_PLATFORM=win32
-else
-LCL_PLATFORM=gtk
-override COMPILER_UNITDIR+=lcl/nonwin32
-endif
-endif
-export LCL_PLATFORM
-ifeq ($(OS_TARGET),darwin)
-LAZARUS_LIBPATHS=-Fl/usr/X11R6/lib -Fl/sw/lib
-endif
-ifndef LAZARUS_CONFIG_DIR
-ifeq ($(OS_TARGET),win32)
-LAZARUS_CONFIG_DIR=.
-else
-LAZARUS_CONFIG_DIR=$(HOME)/.lazarus
-endif
-endif
-export LAZARUS_CONFIG_DIR
-LAZARUS_IDE_CONFIG=$(LAZARUS_CONFIG_DIR)/idemake.cfg
-LAZARUS_OPT=$(LAZARUS_LIBPATHS)
-ifeq ($(OS_TARGET),win32)
-LAZARUS_OPT+= -WG
-endif
 ifeq ($(FULL_TARGET),i386-linux)
 override TARGET_DIRS+=lcl components packager/registration ideintf designer packager
 endif
@@ -555,602 +530,107 @@ ifeq ($(FULL_TARGET),arm-linux)
 override TARGET_EXAMPLEDIRS+=examples
 endif
 ifeq ($(FULL_TARGET),i386-linux)
-override CLEAN_FILES+=$(wildcard ./designer/*$(OEXT)) $(wildcard ./designer/*$(PPUEXT)) $(wildcard ./debugger/*$(OEXT)) $(wildcard ./debugger/*$(PPUEXT)) $(wildcard ./packager/*$(OEXT)) $(wildcard ./packager/*$(PPUEXT)) $(wildcard ./ide/*$(OEXT)) $(wildcard ./ide/*$(PPUEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
-override CLEAN_FILES+=$(wildcard ./designer/*$(OEXT)) $(wildcard ./designer/*$(PPUEXT)) $(wildcard ./debugger/*$(OEXT)) $(wildcard ./debugger/*$(PPUEXT)) $(wildcard ./packager/*$(OEXT)) $(wildcard ./packager/*$(PPUEXT)) $(wildcard ./ide/*$(OEXT)) $(wildcard ./ide/*$(PPUEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override CLEAN_FILES+=$(wildcard ./designer/*$(OEXT)) $(wildcard ./designer/*$(PPUEXT)) $(wildcard ./debugger/*$(OEXT)) $(wildcard ./debugger/*$(PPUEXT)) $(wildcard ./packager/*$(OEXT)) $(wildcard ./packager/*$(PPUEXT)) $(wildcard ./ide/*$(OEXT)) $(wildcard ./ide/*$(PPUEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
 ifeq ($(FULL_TARGET),i386-os2)
-override CLEAN_FILES+=$(wildcard ./designer/*$(OEXT)) $(wildcard ./designer/*$(PPUEXT)) $(wildcard ./debugger/*$(OEXT)) $(wildcard ./debugger/*$(PPUEXT)) $(wildcard ./packager/*$(OEXT)) $(wildcard ./packager/*$(PPUEXT)) $(wildcard ./ide/*$(OEXT)) $(wildcard ./ide/*$(PPUEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override CLEAN_FILES+=$(wildcard ./designer/*$(OEXT)) $(wildcard ./designer/*$(PPUEXT)) $(wildcard ./debugger/*$(OEXT)) $(wildcard ./debugger/*$(PPUEXT)) $(wildcard ./packager/*$(OEXT)) $(wildcard ./packager/*$(PPUEXT)) $(wildcard ./ide/*$(OEXT)) $(wildcard ./ide/*$(PPUEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override CLEAN_FILES+=$(wildcard ./designer/*$(OEXT)) $(wildcard ./designer/*$(PPUEXT)) $(wildcard ./debugger/*$(OEXT)) $(wildcard ./debugger/*$(PPUEXT)) $(wildcard ./packager/*$(OEXT)) $(wildcard ./packager/*$(PPUEXT)) $(wildcard ./ide/*$(OEXT)) $(wildcard ./ide/*$(PPUEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-override CLEAN_FILES+=$(wildcard ./designer/*$(OEXT)) $(wildcard ./designer/*$(PPUEXT)) $(wildcard ./debugger/*$(OEXT)) $(wildcard ./debugger/*$(PPUEXT)) $(wildcard ./packager/*$(OEXT)) $(wildcard ./packager/*$(PPUEXT)) $(wildcard ./ide/*$(OEXT)) $(wildcard ./ide/*$(PPUEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-override CLEAN_FILES+=$(wildcard ./designer/*$(OEXT)) $(wildcard ./designer/*$(PPUEXT)) $(wildcard ./debugger/*$(OEXT)) $(wildcard ./debugger/*$(PPUEXT)) $(wildcard ./packager/*$(OEXT)) $(wildcard ./packager/*$(PPUEXT)) $(wildcard ./ide/*$(OEXT)) $(wildcard ./ide/*$(PPUEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
-override CLEAN_FILES+=$(wildcard ./designer/*$(OEXT)) $(wildcard ./designer/*$(PPUEXT)) $(wildcard ./debugger/*$(OEXT)) $(wildcard ./debugger/*$(PPUEXT)) $(wildcard ./packager/*$(OEXT)) $(wildcard ./packager/*$(PPUEXT)) $(wildcard ./ide/*$(OEXT)) $(wildcard ./ide/*$(PPUEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
 ifeq ($(FULL_TARGET),i386-netware)
-override CLEAN_FILES+=$(wildcard ./designer/*$(OEXT)) $(wildcard ./designer/*$(PPUEXT)) $(wildcard ./debugger/*$(OEXT)) $(wildcard ./debugger/*$(PPUEXT)) $(wildcard ./packager/*$(OEXT)) $(wildcard ./packager/*$(PPUEXT)) $(wildcard ./ide/*$(OEXT)) $(wildcard ./ide/*$(PPUEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
-override CLEAN_FILES+=$(wildcard ./designer/*$(OEXT)) $(wildcard ./designer/*$(PPUEXT)) $(wildcard ./debugger/*$(OEXT)) $(wildcard ./debugger/*$(PPUEXT)) $(wildcard ./packager/*$(OEXT)) $(wildcard ./packager/*$(PPUEXT)) $(wildcard ./ide/*$(OEXT)) $(wildcard ./ide/*$(PPUEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
-override CLEAN_FILES+=$(wildcard ./designer/*$(OEXT)) $(wildcard ./designer/*$(PPUEXT)) $(wildcard ./debugger/*$(OEXT)) $(wildcard ./debugger/*$(PPUEXT)) $(wildcard ./packager/*$(OEXT)) $(wildcard ./packager/*$(PPUEXT)) $(wildcard ./ide/*$(OEXT)) $(wildcard ./ide/*$(PPUEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
 ifeq ($(FULL_TARGET),i386-emx)
-override CLEAN_FILES+=$(wildcard ./designer/*$(OEXT)) $(wildcard ./designer/*$(PPUEXT)) $(wildcard ./debugger/*$(OEXT)) $(wildcard ./debugger/*$(PPUEXT)) $(wildcard ./packager/*$(OEXT)) $(wildcard ./packager/*$(PPUEXT)) $(wildcard ./ide/*$(OEXT)) $(wildcard ./ide/*$(PPUEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
-override CLEAN_FILES+=$(wildcard ./designer/*$(OEXT)) $(wildcard ./designer/*$(PPUEXT)) $(wildcard ./debugger/*$(OEXT)) $(wildcard ./debugger/*$(PPUEXT)) $(wildcard ./packager/*$(OEXT)) $(wildcard ./packager/*$(PPUEXT)) $(wildcard ./ide/*$(OEXT)) $(wildcard ./ide/*$(PPUEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override CLEAN_FILES+=$(wildcard ./designer/*$(OEXT)) $(wildcard ./designer/*$(PPUEXT)) $(wildcard ./debugger/*$(OEXT)) $(wildcard ./debugger/*$(PPUEXT)) $(wildcard ./packager/*$(OEXT)) $(wildcard ./packager/*$(PPUEXT)) $(wildcard ./ide/*$(OEXT)) $(wildcard ./ide/*$(PPUEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override CLEAN_FILES+=$(wildcard ./designer/*$(OEXT)) $(wildcard ./designer/*$(PPUEXT)) $(wildcard ./debugger/*$(OEXT)) $(wildcard ./debugger/*$(PPUEXT)) $(wildcard ./packager/*$(OEXT)) $(wildcard ./packager/*$(PPUEXT)) $(wildcard ./ide/*$(OEXT)) $(wildcard ./ide/*$(PPUEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override CLEAN_FILES+=$(wildcard ./designer/*$(OEXT)) $(wildcard ./designer/*$(PPUEXT)) $(wildcard ./debugger/*$(OEXT)) $(wildcard ./debugger/*$(PPUEXT)) $(wildcard ./packager/*$(OEXT)) $(wildcard ./packager/*$(PPUEXT)) $(wildcard ./ide/*$(OEXT)) $(wildcard ./ide/*$(PPUEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override CLEAN_FILES+=$(wildcard ./designer/*$(OEXT)) $(wildcard ./designer/*$(PPUEXT)) $(wildcard ./debugger/*$(OEXT)) $(wildcard ./debugger/*$(PPUEXT)) $(wildcard ./packager/*$(OEXT)) $(wildcard ./packager/*$(PPUEXT)) $(wildcard ./ide/*$(OEXT)) $(wildcard ./ide/*$(PPUEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
-override CLEAN_FILES+=$(wildcard ./designer/*$(OEXT)) $(wildcard ./designer/*$(PPUEXT)) $(wildcard ./debugger/*$(OEXT)) $(wildcard ./debugger/*$(PPUEXT)) $(wildcard ./packager/*$(OEXT)) $(wildcard ./packager/*$(PPUEXT)) $(wildcard ./ide/*$(OEXT)) $(wildcard ./ide/*$(PPUEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
-override CLEAN_FILES+=$(wildcard ./designer/*$(OEXT)) $(wildcard ./designer/*$(PPUEXT)) $(wildcard ./debugger/*$(OEXT)) $(wildcard ./debugger/*$(PPUEXT)) $(wildcard ./packager/*$(OEXT)) $(wildcard ./packager/*$(PPUEXT)) $(wildcard ./ide/*$(OEXT)) $(wildcard ./ide/*$(PPUEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
-override CLEAN_FILES+=$(wildcard ./designer/*$(OEXT)) $(wildcard ./designer/*$(PPUEXT)) $(wildcard ./debugger/*$(OEXT)) $(wildcard ./debugger/*$(PPUEXT)) $(wildcard ./packager/*$(OEXT)) $(wildcard ./packager/*$(PPUEXT)) $(wildcard ./ide/*$(OEXT)) $(wildcard ./ide/*$(PPUEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
-override CLEAN_FILES+=$(wildcard ./designer/*$(OEXT)) $(wildcard ./designer/*$(PPUEXT)) $(wildcard ./debugger/*$(OEXT)) $(wildcard ./debugger/*$(PPUEXT)) $(wildcard ./packager/*$(OEXT)) $(wildcard ./packager/*$(PPUEXT)) $(wildcard ./ide/*$(OEXT)) $(wildcard ./ide/*$(PPUEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override CLEAN_FILES+=$(wildcard ./designer/*$(OEXT)) $(wildcard ./designer/*$(PPUEXT)) $(wildcard ./debugger/*$(OEXT)) $(wildcard ./debugger/*$(PPUEXT)) $(wildcard ./packager/*$(OEXT)) $(wildcard ./packager/*$(PPUEXT)) $(wildcard ./ide/*$(OEXT)) $(wildcard ./ide/*$(PPUEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override CLEAN_FILES+=$(wildcard ./designer/*$(OEXT)) $(wildcard ./designer/*$(PPUEXT)) $(wildcard ./debugger/*$(OEXT)) $(wildcard ./debugger/*$(PPUEXT)) $(wildcard ./packager/*$(OEXT)) $(wildcard ./packager/*$(PPUEXT)) $(wildcard ./ide/*$(OEXT)) $(wildcard ./ide/*$(PPUEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
-override CLEAN_FILES+=$(wildcard ./designer/*$(OEXT)) $(wildcard ./designer/*$(PPUEXT)) $(wildcard ./debugger/*$(OEXT)) $(wildcard ./debugger/*$(PPUEXT)) $(wildcard ./packager/*$(OEXT)) $(wildcard ./packager/*$(PPUEXT)) $(wildcard ./ide/*$(OEXT)) $(wildcard ./ide/*$(PPUEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override CLEAN_FILES+=$(wildcard ./designer/*$(OEXT)) $(wildcard ./designer/*$(PPUEXT)) $(wildcard ./debugger/*$(OEXT)) $(wildcard ./debugger/*$(PPUEXT)) $(wildcard ./packager/*$(OEXT)) $(wildcard ./packager/*$(PPUEXT)) $(wildcard ./ide/*$(OEXT)) $(wildcard ./ide/*$(PPUEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override CLEAN_FILES+=$(wildcard ./designer/*$(OEXT)) $(wildcard ./designer/*$(PPUEXT)) $(wildcard ./debugger/*$(OEXT)) $(wildcard ./debugger/*$(PPUEXT)) $(wildcard ./packager/*$(OEXT)) $(wildcard ./packager/*$(PPUEXT)) $(wildcard ./ide/*$(OEXT)) $(wildcard ./ide/*$(PPUEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override CLEAN_FILES+=$(wildcard ./designer/*$(OEXT)) $(wildcard ./designer/*$(PPUEXT)) $(wildcard ./debugger/*$(OEXT)) $(wildcard ./debugger/*$(PPUEXT)) $(wildcard ./packager/*$(OEXT)) $(wildcard ./packager/*$(PPUEXT)) $(wildcard ./ide/*$(OEXT)) $(wildcard ./ide/*$(PPUEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override CLEAN_FILES+=$(wildcard ./designer/*$(OEXT)) $(wildcard ./designer/*$(PPUEXT)) $(wildcard ./debugger/*$(OEXT)) $(wildcard ./debugger/*$(PPUEXT)) $(wildcard ./packager/*$(OEXT)) $(wildcard ./packager/*$(PPUEXT)) $(wildcard ./ide/*$(OEXT)) $(wildcard ./ide/*$(PPUEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-override CLEAN_FILES+=$(wildcard ./designer/*$(OEXT)) $(wildcard ./designer/*$(PPUEXT)) $(wildcard ./debugger/*$(OEXT)) $(wildcard ./debugger/*$(PPUEXT)) $(wildcard ./packager/*$(OEXT)) $(wildcard ./packager/*$(PPUEXT)) $(wildcard ./ide/*$(OEXT)) $(wildcard ./ide/*$(PPUEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override CLEAN_FILES+=$(wildcard ./designer/*$(OEXT)) $(wildcard ./designer/*$(PPUEXT)) $(wildcard ./debugger/*$(OEXT)) $(wildcard ./debugger/*$(PPUEXT)) $(wildcard ./packager/*$(OEXT)) $(wildcard ./packager/*$(PPUEXT)) $(wildcard ./ide/*$(OEXT)) $(wildcard ./ide/*$(PPUEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override CLEAN_FILES+=$(wildcard ./designer/*$(OEXT)) $(wildcard ./designer/*$(PPUEXT)) $(wildcard ./debugger/*$(OEXT)) $(wildcard ./debugger/*$(PPUEXT)) $(wildcard ./packager/*$(OEXT)) $(wildcard ./packager/*$(PPUEXT)) $(wildcard ./ide/*$(OEXT)) $(wildcard ./ide/*$(PPUEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override CLEAN_FILES+=$(wildcard ./designer/*$(OEXT)) $(wildcard ./designer/*$(PPUEXT)) $(wildcard ./debugger/*$(OEXT)) $(wildcard ./debugger/*$(PPUEXT)) $(wildcard ./packager/*$(OEXT)) $(wildcard ./packager/*$(PPUEXT)) $(wildcard ./ide/*$(OEXT)) $(wildcard ./ide/*$(PPUEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
 override INSTALL_BASEDIR=share/lazarus
 override INSTALL_FPCPACKAGE=n
 override DIST_DESTDIR=$(BASEDIR)/dist
-ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_OPTIONS+=-gl
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_OPTIONS+=-gl
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_OPTIONS+=-gl
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_OPTIONS+=-gl
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_OPTIONS+=-gl
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_OPTIONS+=-gl
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_OPTIONS+=-gl
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_OPTIONS+=-gl
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_OPTIONS+=-gl
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_OPTIONS+=-gl
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_OPTIONS+=-gl
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_OPTIONS+=-gl
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_OPTIONS+=-gl
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_OPTIONS+=-gl
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_OPTIONS+=-gl
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_OPTIONS+=-gl
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_OPTIONS+=-gl
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_OPTIONS+=-gl
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_OPTIONS+=-gl
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_OPTIONS+=-gl
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_OPTIONS+=-gl
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_OPTIONS+=-gl
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_OPTIONS+=-gl
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_OPTIONS+=-gl
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_OPTIONS+=-gl
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_OPTIONS+=-gl
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_OPTIONS+=-gl
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_OPTIONS+=-gl
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_OPTIONS+=-gl
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_OPTIONS+=-gl
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_OPTIONS+=-gl
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_OPTIONS+=-gl
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_OPTIONS+=-gl
-endif
-ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_INCLUDEDIR+=debugger designer packager ide/include ide/include/$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_INCLUDEDIR+=debugger designer packager ide/include ide/include/$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_INCLUDEDIR+=debugger designer packager ide/include ide/include/$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_INCLUDEDIR+=debugger designer packager ide/include ide/include/$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_INCLUDEDIR+=debugger designer packager ide/include ide/include/$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_INCLUDEDIR+=debugger designer packager ide/include ide/include/$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_INCLUDEDIR+=debugger designer packager ide/include ide/include/$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_INCLUDEDIR+=debugger designer packager ide/include ide/include/$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_INCLUDEDIR+=debugger designer packager ide/include ide/include/$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_INCLUDEDIR+=debugger designer packager ide/include ide/include/$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_INCLUDEDIR+=debugger designer packager ide/include ide/include/$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_INCLUDEDIR+=debugger designer packager ide/include ide/include/$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_INCLUDEDIR+=debugger designer packager ide/include ide/include/$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_INCLUDEDIR+=debugger designer packager ide/include ide/include/$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_INCLUDEDIR+=debugger designer packager ide/include ide/include/$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_INCLUDEDIR+=debugger designer packager ide/include ide/include/$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_INCLUDEDIR+=debugger designer packager ide/include ide/include/$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_INCLUDEDIR+=debugger designer packager ide/include ide/include/$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_INCLUDEDIR+=debugger designer packager ide/include ide/include/$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_INCLUDEDIR+=debugger designer packager ide/include ide/include/$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_INCLUDEDIR+=debugger designer packager ide/include ide/include/$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_INCLUDEDIR+=debugger designer packager ide/include ide/include/$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_INCLUDEDIR+=debugger designer packager ide/include ide/include/$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_INCLUDEDIR+=debugger designer packager ide/include ide/include/$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_INCLUDEDIR+=debugger designer packager ide/include ide/include/$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_INCLUDEDIR+=debugger designer packager ide/include ide/include/$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_INCLUDEDIR+=debugger designer packager ide/include ide/include/$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_INCLUDEDIR+=debugger designer packager ide/include ide/include/$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_INCLUDEDIR+=debugger designer packager ide/include ide/include/$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_INCLUDEDIR+=debugger designer packager ide/include ide/include/$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_INCLUDEDIR+=debugger designer packager ide/include ide/include/$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_INCLUDEDIR+=debugger designer packager ide/include ide/include/$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_INCLUDEDIR+=debugger designer packager ide/include ide/include/$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)-$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)-$(OS_TARGET) ide .
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)-$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)-$(OS_TARGET) ide .
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)-$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)-$(OS_TARGET) ide .
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)-$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)-$(OS_TARGET) ide .
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)-$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)-$(OS_TARGET) ide .
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)-$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)-$(OS_TARGET) ide .
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)-$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)-$(OS_TARGET) ide .
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)-$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)-$(OS_TARGET) ide .
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)-$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)-$(OS_TARGET) ide .
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)-$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)-$(OS_TARGET) ide .
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)-$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)-$(OS_TARGET) ide .
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)-$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)-$(OS_TARGET) ide .
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)-$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)-$(OS_TARGET) ide .
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)-$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)-$(OS_TARGET) ide .
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)-$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)-$(OS_TARGET) ide .
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)-$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)-$(OS_TARGET) ide .
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)-$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)-$(OS_TARGET) ide .
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)-$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)-$(OS_TARGET) ide .
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)-$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)-$(OS_TARGET) ide .
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)-$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)-$(OS_TARGET) ide .
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)-$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)-$(OS_TARGET) ide .
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)-$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)-$(OS_TARGET) ide .
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)-$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)-$(OS_TARGET) ide .
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)-$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)-$(OS_TARGET) ide .
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)-$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)-$(OS_TARGET) ide .
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)-$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)-$(OS_TARGET) ide .
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)-$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)-$(OS_TARGET) ide .
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)-$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)-$(OS_TARGET) ide .
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)-$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)-$(OS_TARGET) ide .
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)-$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)-$(OS_TARGET) ide .
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)-$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)-$(OS_TARGET) ide .
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)-$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)-$(OS_TARGET) ide .
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)-$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)-$(OS_TARGET) ide .
-endif
-ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_TARGETDIR+=.
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_TARGETDIR+=.
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_TARGETDIR+=.
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_TARGETDIR+=.
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_TARGETDIR+=.
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_TARGETDIR+=.
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_TARGETDIR+=.
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_TARGETDIR+=.
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_TARGETDIR+=.
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_TARGETDIR+=.
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_TARGETDIR+=.
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_TARGETDIR+=.
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_TARGETDIR+=.
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_TARGETDIR+=.
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_TARGETDIR+=.
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_TARGETDIR+=.
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_TARGETDIR+=.
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_TARGETDIR+=.
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_TARGETDIR+=.
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_TARGETDIR+=.
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_TARGETDIR+=.
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_TARGETDIR+=.
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_TARGETDIR+=.
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_TARGETDIR+=.
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_TARGETDIR+=.
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_TARGETDIR+=.
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_TARGETDIR+=.
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_TARGETDIR+=.
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_TARGETDIR+=.
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_TARGETDIR+=.
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_TARGETDIR+=.
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_TARGETDIR+=.
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_TARGETDIR+=.
-endif
-ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
-endif
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
 endif
@@ -1945,10 +1425,10 @@ endif
 ifeq ($(FULL_TARGET),i386-os2)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_REGEXPR=1
 REQUIRE_PACKAGES_PASJPEG=1
-REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
@@ -2039,10 +1519,10 @@ endif
 ifeq ($(FULL_TARGET),i386-emx)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_REGEXPR=1
 REQUIRE_PACKAGES_PASJPEG=1
-REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
@@ -3825,63 +3305,26 @@ zipinstall: fpc_zipinstall
 zipsourceinstall: fpc_zipsourceinstall
 zipexampleinstall: fpc_zipexampleinstall $(addsuffix _zipexampleinstall,$(TARGET_DIRS))
 zipdistinstall: fpc_zipdistinstall
-clean: fpc_clean $(addsuffix _clean,$(TARGET_DIRS)) $(addsuffix _clean,$(TARGET_EXAMPLEDIRS))
 distclean: fpc_distclean $(addsuffix _distclean,$(TARGET_DIRS))
 cleanall: fpc_cleanall $(addsuffix _cleanall,$(TARGET_DIRS))
 info: fpc_info
 makefiles: fpc_makefiles
-.PHONY: debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info makefiles
+.PHONY: debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall distclean cleanall info makefiles
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
 .PHONY: lcl components packager/registration ideintf packager ide idepkg starter tools all clean cleanide purge
-.SUFFIXES: .rc .res
+ide:
-%.res: %.rc
+	$(MAKE) -C ide ide
-	windres --include-dir ide -i $< -o $@ --preprocessor $(RCPP)
+idepkg:
-ide: $(COMPILER_UNITTARGETDIR)
+	$(MAKE) -C ide idepkg
-ifeq ($(OS_TARGET), win32)
+starter:
-	$(MAKE) ide/lazarus.res
+	$(MAKE) -C ide starter
-endif
-ifeq ($(LAZARUS_OPT),)
-	$(MAKE) --assume-new=ide/lazarus.pp ide/lazarus$(EXEEXT)
-else
-	$(MAKE) --assume-new=ide/lazarus.pp ide/lazarus$(EXEEXT) OPT='$(LAZARUS_OPT) $(OPT)'
-endif
-idepkg: $(COMPILER_UNITTARGETDIR)
-	$(MAKE) --assume-new=ide/lazarus.pp ide/lazarus$(EXEEXT) OPT='$(LAZARUS_OPT) $(OPT) @$(LAZARUS_IDE_CONFIG)'
-starter: $(COMPILER_UNITTARGETDIR)
-ifeq ($(OS_TARGET), win32)
-	$(MAKE) ide/startlazarus.res
-endif
-ifeq ($(LAZARUS_OPT),)
-	$(MAKE) --assume-new=ide/startlazarus.lpr ide/startlazarus$(EXEEXT)
-else
-	$(MAKE) --assume-new=ide/startlazarus.lpr ide/startlazarus$(EXEEXT) OPT='$(LAZARUS_OPT) $(OPT)'
-endif
 tools: lcl components
 	$(MAKE) -C tools
 all: lcl components packager/registration ideintf designer packager ide starter
 cleanide:
-	-$(DEL) $(wildcard *$(OEXT))
+	$(MAKE) -C ide cleanide
-	-$(DEL) $(wildcard *$(PPUEXT))
-	-$(DEL) $(wildcard *$(RSTEXT))
-	-$(DEL) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT))
-	-$(DEL) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT))
-	-$(DEL) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT))
-	-$(DEL) $(wildcard ./ide/*$(OEXT))
-	-$(DEL) $(wildcard ./ide/*$(PPUEXT))
-	-$(DEL) $(wildcard ./designer/*$(OEXT))
-	-$(DEL) $(wildcard ./designer/*$(PPUEXT))
-	-$(DEL) $(wildcard ./debugger/*$(OEXT))
-	-$(DEL) $(wildcard ./debugger/*$(PPUEXT))
-	-$(DEL) $(wildcard ./packager/*$(OEXT))
-	-$(DEL) $(wildcard ./packager/*$(PPUEXT))
-	-$(DEL) $(wildcard ./doceditor/*$(OEXT))
-	-$(DEL) $(wildcard ./doceditor/*$(PPUEXT))
-ifeq ($(OS_TARGET), win32)
-	-$(DEL) $(wildcard *.res)
-	-$(DEL) lazarus.owr
-endif
 cleanlaz: clean cleanide
 	$(MAKE) -C lcl clean
 	$(MAKE) -C components clean
@@ -3893,3 +3336,4 @@ purge: cleanlaz
 	$(MAKE) -C tools clean
 	$(MAKE) -C doceditor clean
 	$(MAKE) -C tools clean
+clean: cleanlaz

Makefile.fpc

@@ -8,7 +8,6 @@ version=0.9b
 
 [require]
 packages=fcl regexpr
-# Adding lcl codetools synedit, adds the source paths.
 
 [target]
 programs=lazarus startlazarus
@@ -16,28 +15,9 @@ dirs=lcl components packager/registration ideintf designer packager
 exampledirs=examples
 
 [compiler]
-options=-gl
-unittargetdir=units/$(CPU_TARGET)-$(OS_TARGET)
-unitdir=lcl/units/$(CPU_TARGET)-$(OS_TARGET) \
-        lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) \
-        components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) \
-        components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) \
-        components/custom \
-        components/mpaslex \
-        ideintf/units/$(CPU_TARGET)-$(OS_TARGET) \
-        designer designer/units debugger \
-        packager \
-        packager/units/$(CPU_TARGET)-$(OS_TARGET) \
-        ide .
-includedir=debugger designer packager ide/include ide/include/$(OS_TARGET)
-targetdir=.
 
 [clean]
-files=$(wildcard ./designer/*$(OEXT)) $(wildcard ./designer/*$(PPUEXT)) \
+files=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
-      $(wildcard ./debugger/*$(OEXT)) $(wildcard ./debugger/*$(PPUEXT)) \
-      $(wildcard ./packager/*$(OEXT)) $(wildcard ./packager/*$(PPUEXT)) \
-      $(wildcard ./ide/*$(OEXT)) $(wildcard ./ide/*$(PPUEXT)) \
-      $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 
 [install]
 fpcpackage=n
@@ -47,80 +27,24 @@ basedir=share/lazarus
 destdir=$(BASEDIR)/dist
 
 [prerules]
-# old RCPP
-# RCPP?=$(strip $(firstword $(wildcard $(addsuffix /cpp$(SRCEXEEXT), $(SEARCHPATH)))))
-# new RCPP, hint from bug 652
 RCPP?=$(strip $(firstword cpp$(SRCEXEEXT)))
 #
-# LCL Platform
-ifndef LCL_PLATFORM
-ifeq ($(OS_TARGET),win32)
-LCL_PLATFORM=win32
-else
-LCL_PLATFORM=gtk
-override COMPILER_UNITDIR+=lcl/nonwin32
-endif
-endif
-export LCL_PLATFORM
-#
-# LibPaths
-ifeq ($(OS_TARGET),darwin)
-LAZARUS_LIBPATHS=-Fl/usr/X11R6/lib -Fl/sw/lib
-endif
-#
-# user config
-ifndef LAZARUS_CONFIG_DIR
-ifeq ($(OS_TARGET),win32)
-LAZARUS_CONFIG_DIR=.
-else
-LAZARUS_CONFIG_DIR=$(HOME)/.lazarus
-endif
-endif
-export LAZARUS_CONFIG_DIR
-#
-# idemake.cfg
-LAZARUS_IDE_CONFIG=$(LAZARUS_CONFIG_DIR)/idemake.cfg
-LAZARUS_OPT=$(LAZARUS_LIBPATHS)
-
-#
-# apptype gui
-ifeq ($(OS_TARGET),win32)
-LAZARUS_OPT+= -WG
-endif
 
 #-----------------------------------------------------------------------------
 [rules]
 .PHONY: lcl components packager/registration ideintf packager ide idepkg starter tools all clean cleanide purge
-.SUFFIXES: .rc .res
-
-%.res: %.rc
-        windres --include-dir ide -i $< -o $@ --preprocessor $(RCPP)
 
 #-----------------------------------------------------------------------------
-ide: $(COMPILER_UNITTARGETDIR)
+ide:
-ifeq ($(OS_TARGET), win32)
+        $(MAKE) -C ide ide
-        $(MAKE) ide/lazarus.res
-endif
-ifeq ($(LAZARUS_OPT),)
-        $(MAKE) --assume-new=ide/lazarus.pp ide/lazarus$(EXEEXT)
-else
-        $(MAKE) --assume-new=ide/lazarus.pp ide/lazarus$(EXEEXT) OPT='$(LAZARUS_OPT) $(OPT)'
-endif
 
 #-----------------------------------------------------------------------------
-idepkg: $(COMPILER_UNITTARGETDIR)
+idepkg:
-        $(MAKE) --assume-new=ide/lazarus.pp ide/lazarus$(EXEEXT) OPT='$(LAZARUS_OPT) $(OPT) @$(LAZARUS_IDE_CONFIG)'
+        $(MAKE) -C ide idepkg
 
 #-----------------------------------------------------------------------------
-starter: $(COMPILER_UNITTARGETDIR)
+starter:
-ifeq ($(OS_TARGET), win32)
+        $(MAKE) -C ide starter
-        $(MAKE) ide/startlazarus.res
-endif
-ifeq ($(LAZARUS_OPT),)
-        $(MAKE) --assume-new=ide/startlazarus.lpr ide/startlazarus$(EXEEXT)
-else
-        $(MAKE) --assume-new=ide/startlazarus.lpr ide/startlazarus$(EXEEXT) OPT='$(LAZARUS_OPT) $(OPT)'
-endif
 
 #-----------------------------------------------------------------------------
 tools: lcl components
@@ -131,26 +55,7 @@ all: lcl components packager/registration ideintf designer packager ide starter
 
 #-----------------------------------------------------------------------------
 cleanide:
-        -$(DEL) $(wildcard *$(OEXT))
+        $(MAKE) -C ide cleanide
-        -$(DEL) $(wildcard *$(PPUEXT))
-        -$(DEL) $(wildcard *$(RSTEXT))
-        -$(DEL) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT))
-        -$(DEL) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT))
-        -$(DEL) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT))
-        -$(DEL) $(wildcard ./ide/*$(OEXT))
-        -$(DEL) $(wildcard ./ide/*$(PPUEXT))
-        -$(DEL) $(wildcard ./designer/*$(OEXT))
-        -$(DEL) $(wildcard ./designer/*$(PPUEXT))
-        -$(DEL) $(wildcard ./debugger/*$(OEXT))
-        -$(DEL) $(wildcard ./debugger/*$(PPUEXT))
-        -$(DEL) $(wildcard ./packager/*$(OEXT))
-        -$(DEL) $(wildcard ./packager/*$(PPUEXT))
-        -$(DEL) $(wildcard ./doceditor/*$(OEXT))
-        -$(DEL) $(wildcard ./doceditor/*$(PPUEXT))
-ifeq ($(OS_TARGET), win32)
-        -$(DEL) $(wildcard *.res)
-        -$(DEL) lazarus.owr
-endif
 
 cleanlaz: clean cleanide
         $(MAKE) -C lcl clean
@@ -165,6 +70,8 @@ purge: cleanlaz
         $(MAKE) -C doceditor clean
         $(MAKE) -C tools clean
 
+clean: cleanlaz
+
 #install: $(INSTALLTARGET) $(addsuffix _install,$(TARGET_DIRS))
 # end.
 

components/codetools/definetemplates.pas

@@ -3644,7 +3644,7 @@ begin
   DirTempl.AddChild(TDefineTemplate.Create('main path addition',
     Format(ctsAddsDirToSourcePath,[ctsLazarusMainDirectory]),
     SrcPathMacroName,
-    d('..;../packager;')+SrcPath
+    d('../ide;../packager;')+SrcPath
     ,da_Define));
   DirTempl.AddChild(TDefineTemplate.Create('components path addition',
     Format(ctsAddsDirToSourcePath,['synedit']),
@@ -3691,7 +3691,7 @@ begin
   DirTempl.AddChild(TDefineTemplate.Create('LCL path addition',
     Format(ctsAddsDirToSourcePath,['lcl, components']),
     ExternalMacroStart+'SrcPath',
-      d('..'
+      d('../ide'
        +';../ideintf'
        +';../components/codetools'
        +';../lcl'
@@ -3707,8 +3707,7 @@ begin
   DirTempl.AddChild(TDefineTemplate.Create('Unit path addition',
     Format(ctsAddsDirToSourcePath,['lcl, components']),
     SrcPathMacroName,
-      d('..'
+      d('../ideintf'
-       +';../ideintf'
        +';../components/codetools'
        +';../lcl'
        +';../lcl/interfaces/'+WidgetType)
@@ -3723,15 +3722,14 @@ begin
   DirTempl.AddChild(TDefineTemplate.Create('LCL path addition',
     Format(ctsAddsDirToSourcePath,['lcl']),
     SrcPathMacroName,
-      d('../ideintf'
+      d('../lcl'
-      +';../lcl'
       +';../lcl/interfaces/'+WidgetType)
       +';'+SrcPath
     ,da_Define));
   DirTempl.AddChild(TDefineTemplate.Create('main path addition',
     Format(ctsAddsDirToSourcePath,[ctsLazarusMainDirectory]),
     SrcPathMacroName,
-    '..;'+SrcPath
+    '../ide;'+SrcPath
     ,da_Define));
   DirTempl.AddChild(TDefineTemplate.Create('components path addition',
     Format(ctsAddsDirToSourcePath,['synedit']),

ide/Makefile.fpc

@@ -0,0 +1,154 @@
+#
+#   Makefile.fpc for Lazarus for Free Pascal
+#
+
+[package]
+name=lazaruside
+version=0.9b
+
+[require]
+packages=fcl regexpr
+
+[target]
+programs=lazarus startlazarus
+
+[compiler]
+options=-gl
+unittargetdir=../units/$(CPU_TARGET)-$(OS_TARGET)
+unitdir=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) \
+        ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) \
+        ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) \
+        ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) \
+        ../components/custom \
+        ../components/mpaslex \
+        ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) \
+        ../designer ../designer/units ../debugger \
+        ../packager \
+        ../packager/units/$(CPU_TARGET)-$(OS_TARGET) \
+        .
+includedir=include include/$(OS_TARGET) ../images
+targetdir=..
+
+[clean]
+files=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) \
+      $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) \
+      $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) \
+      $(wildcard ../designer/*$(OEXT)) $(wildcard ../designer/*$(PPUEXT)) \
+      $(wildcard ../debugger/*$(OEXT)) $(wildcard ../debugger/*$(PPUEXT)) \
+      $(wildcard ../packager/*$(OEXT)) $(wildcard ../packager/*$(PPUEXT)) \
+      $(wildcard ../*$(OEXT)) $(wildcard ../*$(PPUEXT)) \
+      $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+
+[install]
+fpcpackage=n
+basedir=share/lazarus/ide
+
+[dist]
+destdir=$(BASEDIR)/dist
+
+[prerules]
+RCPP?=$(strip $(firstword cpp$(SRCEXEEXT)))
+#
+# LCL Platform
+ifndef LCL_PLATFORM
+ifeq ($(OS_TARGET),win32)
+LCL_PLATFORM=win32
+else
+LCL_PLATFORM=gtk
+override COMPILER_UNITDIR+=../lcl/nonwin32
+endif
+endif
+export LCL_PLATFORM
+#
+# LibPaths
+ifeq ($(OS_TARGET),darwin)
+LAZARUS_LIBPATHS=-Fl/usr/X11R6/lib -Fl/sw/lib
+endif
+#
+# user config
+ifndef LAZARUS_CONFIG_DIR
+ifeq ($(OS_TARGET),win32)
+LAZARUS_CONFIG_DIR=..
+else
+LAZARUS_CONFIG_DIR=$(HOME)/.lazarus
+endif
+endif
+export LAZARUS_CONFIG_DIR
+#
+# idemake.cfg
+LAZARUS_IDE_CONFIG=$(LAZARUS_CONFIG_DIR)/idemake.cfg
+LAZARUS_OPT=$(LAZARUS_LIBPATHS)
+
+#
+# apptype gui
+ifeq ($(OS_TARGET),win32)
+LAZARUS_OPT+= -WG
+endif
+
+#-----------------------------------------------------------------------------
+[rules]
+.PHONY: ide idepkg starter all clean cleanide purge
+.SUFFIXES: .rc .res
+
+%.res: %.rc
+        windres -i $< -o $@ --preprocessor $(RCPP)
+
+#-----------------------------------------------------------------------------
+ide: $(COMPILER_UNITTARGETDIR)
+ifeq ($(OS_TARGET), win32)
+        $(MAKE) lazarus.res
+endif
+ifeq ($(LAZARUS_OPT),)
+        $(MAKE) --assume-new=../lazarus$(EXEEXT) lazarus$(EXEEXT)
+else
+        $(MAKE) --assume-new=../lazarus$(EXEEXT) lazarus$(EXEEXT) OPT='$(LAZARUS_OPT) $(OPT)'
+endif
+
+#-----------------------------------------------------------------------------
+idepkg: $(COMPILER_UNITTARGETDIR)
+        $(MAKE) --assume-new=../lazarus$(EXEEXT) lazarus$(EXEEXT) OPT='$(LAZARUS_OPT) $(OPT) @$(LAZARUS_IDE_CONFIG)'
+
+#-----------------------------------------------------------------------------
+starter: $(COMPILER_UNITTARGETDIR)
+ifeq ($(OS_TARGET), win32)
+        $(MAKE) startlazarus.res
+endif
+ifeq ($(LAZARUS_OPT),)
+        $(MAKE) --assume-new=../startlazarus$(EXEEXT) startlazarus$(EXEEXT)
+else
+        $(MAKE) --assume-new=../startlazarus$(EXEEXT) startlazarus$(EXEEXT) OPT='$(LAZARUS_OPT) $(OPT)'
+endif
+
+#-----------------------------------------------------------------------------
+all: ide starter
+
+#-----------------------------------------------------------------------------
+cleanide:
+        -$(DEL) $(wildcard *$(OEXT))
+        -$(DEL) $(wildcard *$(PPUEXT))
+        -$(DEL) $(wildcard *$(RSTEXT))
+        -$(DEL) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT))
+        -$(DEL) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT))
+        -$(DEL) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT))
+        -$(DEL) $(wildcard ../*$(OEXT))
+        -$(DEL) $(wildcard ../*$(PPUEXT))
+        -$(DEL) $(wildcard ./designer/*$(OEXT))
+        -$(DEL) $(wildcard ./designer/*$(PPUEXT))
+        -$(DEL) $(wildcard ./debugger/*$(OEXT))
+        -$(DEL) $(wildcard ./debugger/*$(PPUEXT))
+        -$(DEL) $(wildcard ./packager/*$(OEXT))
+        -$(DEL) $(wildcard ./packager/*$(PPUEXT))
+        -$(DEL) $(wildcard ./doceditor/*$(OEXT))
+        -$(DEL) $(wildcard ./doceditor/*$(PPUEXT))
+ifeq ($(OS_TARGET), win32)
+        -$(DEL) $(wildcard *.res)
+        -$(DEL) lazarus.owr
+endif
+
+cleanlaz: clean cleanide
+
+purge: cleanlaz
+
+#install: $(INSTALLTARGET) $(addsuffix _install,$(TARGET_DIRS))
+# end.
+

ide/idedefs.pas

@@ -38,7 +38,7 @@ unit IDEDefs;
 interface
 
 uses
-  Classes, SysUtils; 
+  Classes, SysUtils, Menus;
 
 type
   TIDEFileStateFlag = (
@@ -56,7 +56,6 @@ type
     NeededFlags: TIDEFileStateFlags; var ResultFlags: TIDEFileStateFlags)
     of object;
     
-
 implementation
 
 end.

ide/keymapping.pp

@@ -273,7 +273,7 @@ type
     procedure Clear; override;
     procedure Delete(Index: Integer); override;
     constructor Create(const AName, ADescription: string;
-	  TheAreas: TCommandAreas);
+    TheAreas: TCommandAreas);
   end;
   
   //---------------------------------------------------------------------------

ide/main.pp

@@ -70,7 +70,7 @@ uses
   CodeToolsStructs, CodeToolManager, CodeCache, DefineTemplates,
   // IDE interface
   AllIDEIntf, ObjectInspector, PropEdits, MacroIntf, IDECommands, SrcEditorIntf,
-  NewItemIntf, PackageIntf, ProjectIntf, LazIDEIntf,
+  NewItemIntf, PackageIntf, ProjectIntf, MenuIntf, LazIDEIntf,
   // synedit
   SynEditKeyCmds,
   // protocol
@@ -328,6 +328,7 @@ type
     procedure OnSrcNotebookToggleObjectInsp(Sender: TObject);
     procedure OnSrcNotebookViewJumpHistory(Sender: TObject);
     procedure OnSrcNotebookShowSearchResultsView(Sender: TObject);
+    procedure OnSrcNoteBookPopupMenu(AddMenuItemProc: TAddMenuItemProc);
 
     // ObjectInspector + PropertyEditorHook events
     procedure OIOnSelectPersistents(Sender: TObject);
@@ -1430,6 +1431,7 @@ begin
   SourceNotebook.OnToggleObjectInspClicked:= @OnSrcNotebookToggleObjectInsp;
   SourceNotebook.OnViewJumpHistory := @OnSrcNotebookViewJumpHistory;
   SourceNotebook.OnShowSearchResultsView := @OnSrcNotebookShowSearchResultsView;
+  SourceNotebook.OnPopupMenu := @OnSrcNoteBookPopupMenu;
   DebugBoss.ConnectSourceNotebookEvents;
 
   // connect search menu to sourcenotebook
@@ -11096,6 +11098,11 @@ begin
   CreateSearchResultWindow;
 end;
 
+procedure TMainIDE.OnSrcNoteBookPopupMenu(AddMenuItemProc: TAddMenuItemProc);
+begin
+  PkgBoss.OnSourceEditorPopupMenu(AddMenuItemProc);
+end;
+
 procedure TMainIDE.OnApplicationUserInput(Sender: TObject; Msg: Cardinal);
 begin
   if ToolStatus=itCodeTools then begin

ide/sourcemarks.pas

@@ -39,8 +39,7 @@ interface
 
 uses
   Classes, SysUtils, LCLProc, LResources, Graphics, GraphType, Controls, Menus,
-  {$IFNDEF VER1_0}AVL_Tree{$ELSE}OldAvLTree{$ENDIF}, SynEdit, IDEProcs,
+  AVL_Tree, SynEdit, IDEProcs, MenuIntf, EditorOptions;
-  EditorOptions;
   
 type
   TSourceMarks = class;

ide/uniteditor.pp

@@ -50,7 +50,7 @@ uses
   SynEditTypes, SynEdit, SynRegExpr, SynEditHighlighter, SynEditAutoComplete,
   SynEditKeyCmds, SynCompletion,
   // IDE interface
-  HelpIntf, SrcEditorIntf, LazIDEIntf,
+  HelpIntf, SrcEditorIntf, MenuIntf, LazIDEIntf,
   // IDE units
   LazarusIDEStrConsts, LazConf, IDECommands, EditorOptions, KeyMapping, Project,
   WordCompletion, FindReplaceDialog, FindInFilesDlg, IDEProcs, IDEOptionDefs,
@@ -312,15 +312,18 @@ type
   TJumpHistoryAction = (jhaBack, jhaForward);
 
   TOnJumpToHistoryPoint = procedure(var NewCaretXY: TPoint;
-    var NewTopLine, NewPageIndex: integer; Action: TJumpHistoryAction) of object;
+                                    var NewTopLine, NewPageIndex: integer;
+                                    Action: TJumpHistoryAction) of object;
   TOnAddJumpPoint = procedure(ACaretXY: TPoint; ATopLine: integer;
-    APageIndex: integer; DeleteForwardHistory: boolean) of object;
+                  APageIndex: integer; DeleteForwardHistory: boolean) of object;
   TOnMovingPage = procedure(Sender: TObject;
-    OldPageIndex, NewPageIndex: integer) of object;
+                            OldPageIndex, NewPageIndex: integer) of object;
   TOnShowHintForSource = procedure(SrcEdit: TSourceEditor; ClientPos: TPoint;
-    CaretPos: TPoint) of object;
+                                   CaretPos: TPoint) of object;
   TOnInitIdentCompletion = procedure(Sender: TObject;
-    var Handled, Abort: boolean) of object;
+                                     var Handled, Abort: boolean) of object;
+  TSrcEditPopupMenuEvent = procedure(AddMenuItemProc: TAddMenuItemProc
+                                     ) of object;
 
   TSourceNotebookState = (snIncrementalFind, snIncrementalSearching);
   TSourceNotebookStates = set of TSourceNotebookState;
@@ -425,6 +428,7 @@ type
     FProcessingCommand: boolean;
     FSourceEditorList: TList; // list of TSourceEditor
     FUnUsedEditorComponents: TList; // list of TSynEdit
+    FOnPopupMenu: TSrcEditPopupMenuEvent;
   private
     // colors for the completion form (popup form, e.g. word completion)
     FActiveEditDefaultFGColor: TColor;
@@ -657,6 +661,7 @@ type
                              read FOnAddWatchAtCursor write FOnAddWatchAtCursor;
     property OnShowSearchResultsView: TNotifyEvent
                    read FOnShowSearchResultsView write FOnShowSearchResultsView;
+    property OnPopupMenu: TSrcEditPopupMenuEvent read FOnPopupMenu write FOnPopupMenu;
   end;
 
   //=============================================================================
@@ -2913,6 +2918,7 @@ begin
         'Open '+ChangeFileExt(ExtractFileName(CurFilename),'.pp'),
         true,@OnPopupMenuOpenPPFile);
   end;
+  if Assigned(OnPopupMenu) then OnPopupMenu(@AddUserDefinedPopupMenuItem);
 end;
 
 procedure TSourceNotebook.NotebookShowTabHint(Sender: TObject;

ideintf/menuintf.pas

@@ -14,6 +14,11 @@
 
   Abstract:
     Interface to the IDE menus.
+    
+  ToDo:
+    - implement creating Top and Bottom separator
+    - Root items
+    - OnPopup
 }
 unit MenuIntf;
 
@@ -25,6 +30,10 @@ uses
   Classes, SysUtils, Menus, ImgList, Graphics, IDECommands;
   
 type
+  TAddMenuItemProc =
+    function (const NewCaption: string; const NewEnabled: boolean;
+              const NewOnClick: TNotifyEvent): TMenuItem of object;
+
   TIDEMenuSection = class;
 
   { TIDEMenuItem
@@ -105,6 +114,8 @@ type
     function GetChildsStartIndex: Integer;
     function Size: Integer; override;
     function IndexOf(AnItem: TIDEMenuItem): Integer;
+    function NeedTopSeparator: Boolean;
+    function NeedBottomSeparator: Boolean;
   public
     property ChildsAsSubMenu: boolean read FChildsAsSubMenu
                                           write SetChildsAsSubMenu default true;
@@ -359,6 +370,9 @@ var
   i: Integer;
 begin
   if MenuItem=nil then exit;
+  
+  
+  
   Item:=Items[Index];
   // create the child TMenuItem
   Item.CreateMenuItem;
@@ -414,6 +428,32 @@ begin
   Result:=FItems.IndexOf(AnItem);
 end;
 
+function TIDEMenuSection.NeedTopSeparator: Boolean;
+begin
+  if (not ChildsAsSubMenu) and (Section<>nil) and (Section.Items[0]<>Self) then
+    Result:=true
+  else
+    Result:=false;
+end;
+
+function TIDEMenuSection.NeedBottomSeparator: Boolean;
+var
+  SelfIndex: LongInt;
+  NextSibling: TIDEMenuItem;
+begin
+  Result:=false;
+  if (not ChildsAsSubMenu) and (Section<>nil)
+  and (Section.Items[Section.Count-1]<>Self) then begin
+    SelfIndex:=Section.IndexOf(Self);
+    NextSibling:=Section[SelfIndex-1];
+    if (not (NextSibling is TIDEMenuSection))
+    or (not TIDEMenuSection(NextSibling).ChildsAsSubMenu) then begin
+      // a bottom separator is needed
+      Result:=true;
+    end;
+  end;
+end;
+
 function TIDEMenuSection.GetItems(Index: Integer): TIDEMenuItem;
 begin
   Result:=TIDEMenuItem(FItems[Index]);

packager/basepkgmanager.pas

@@ -45,7 +45,7 @@ uses
   MemCheck,
 {$ENDIF}
   Classes, SysUtils, Forms, LazIDEIntf,
-  PackageDefs, ComponentReg, CompilerOptions, Project, PackageIntf;
+  PackageDefs, ComponentReg, CompilerOptions, Project, PackageIntf, MenuIntf;
 
 type
   TPkgSaveFlag = (
@@ -83,6 +83,7 @@ type
     procedure SaveSettings; virtual; abstract;
     procedure UpdateVisibleComponentPalette; virtual; abstract;
     procedure ProcessCommand(Command: word; var Handled: boolean); virtual; abstract;
+    procedure OnSourceEditorPopupMenu(AddMenuItemProc: TAddMenuItemProc); virtual; abstract;
 
     // files
     function GetDefaultSaveDirectoryForFile(const Filename: string): string; virtual; abstract;
@@ -90,7 +91,7 @@ type
                           IsPartOfProject: boolean): TModalResult; virtual; abstract;
     function FindIncludeFileInProjectDependencies(Project1: TProject;
                           const Filename: string): string; virtual; abstract;
-    function SearchFile(const ShortFilename: string;
+    function SearchFile(const AFilename: string;
                         SearchFlags: TSearchIDEFileFlags;
                         InObject: TObject): TPkgFile; virtual; abstract;
 

packager/packagedefs.pas

@@ -185,6 +185,7 @@ type
     function HasRegisteredPlugins: boolean;
     function MakeSense: boolean;
     procedure UpdateSourceDirectoryReference;
+    function GetFullFilename: string;
   public
     property Removed: boolean read FRemoved write SetRemoved;
     property Directory: string read FDirectory;
@@ -646,7 +647,7 @@ type
     function NeedsDefineTemplates: boolean;
     // files
     function IndexOfPkgFile(PkgFile: TPkgFile): integer;
-    function SearchFile(const ShortFilename: string;
+    function SearchFile(const AFilename: string;
                         SearchFlags: TSearchIDEFileFlags): TPkgFile;
     procedure ShortenFilename(var ExpandedFilename: string; UseUp: boolean);
     procedure LongenFilename(var AFilename: string);
@@ -1388,6 +1389,11 @@ begin
   end;
 end;
 
+function TPkgFile.GetFullFilename: string;
+begin
+  Result:=Filename;
+end;
+
 constructor TPkgFile.Create(ThePackage: TLazPackage);
 begin
   Clear;
@@ -2994,26 +3000,27 @@ begin
   while (Files[Result]<>PkgFile) do dec(Result);
 end;
 
-function TLazPackage.SearchFile(const ShortFilename: string;
+function TLazPackage.SearchFile(const AFilename: string;
   SearchFlags: TSearchIDEFileFlags): TPkgFile;
 var
   SearchedFilename: String;
   i: Integer;
 
-  function FilenameFits(AFilename: string): boolean;
+  function FilenameFits(TheFilename: string): boolean;
   begin
     if siffIgnoreExtension in SearchFlags then
-      AFileName:=ExtractFilenameOnly(AFileName);
+      TheFileName:=ExtractFilenameOnly(TheFileName);
-    if FilenameIsAbsolute(AFileName) then
+    if FilenameIsAbsolute(TheFileName) then
-      AFileName:=ExtractFilename(AFileName);
+      TheFileName:=ExtractFilename(TheFileName);
+    debugln('TLazPackage.SearchFile A ',SearchedFilename,' ',TheFilename);
     if siffCaseSensitive in SearchFlags then
-      Result:=SearchedFilename=AFilename
+      Result:=SearchedFilename=TheFilename
     else
-      Result:=AnsiCompareText(SearchedFilename,AFilename)=0;
+      Result:=AnsiCompareText(SearchedFilename,TheFilename)=0;
   end;
 
 begin
-  SearchedFilename:=ShortFilename;
+  SearchedFilename:=AFilename;
   if siffIgnoreExtension in SearchFlags then
     SearchedFilename:=ExtractFilenameOnly(SearchedFilename);
 

packager/pkgmanager.pas

@@ -50,7 +50,7 @@ uses
   CodeToolManager, CodeCache, BasicCodeTools,
   {$IFNDEF VER1_0}AVL_Tree{$ELSE}OldAvLTree{$ENDIF}, Laz_XMLCfg,
   // IDE Interface
-  NewItemIntf, ProjectIntf, PackageIntf, LazIDEIntf,
+  NewItemIntf, ProjectIntf, PackageIntf, MenuIntf, LazIDEIntf,
   // IDE
   LazConf, LazarusIDEStrConsts, IDEProcs, ObjectLists, DialogProcs, KeyMapping,
   EnvironmentOpts, MiscOptions, InputHistory, ProjectDefs, Project,
@@ -143,6 +143,7 @@ type
                                             var AnOutDirectory: string);
     procedure OnCheckInstallPackageList(PkgIDList: TList; var Ok: boolean);
     function LoadDependencyList(FirstDependency: TPkgDependency): TModalResult;
+    procedure OnOpenPackageForCurrentSrcEditFile(Sender: TObject);
   private
     FirstAutoInstallDependency: TPkgDependency;
     // helper functions
@@ -191,6 +192,7 @@ type
     procedure SaveSettings; override;
     procedure UpdateVisibleComponentPalette; override;
     procedure ProcessCommand(Command: word; var Handled: boolean); override;
+    procedure OnSourceEditorPopupMenu(AddMenuItemProc: TAddMenuItemProc); override;
 
     // files
     function GetDefaultSaveDirectoryForFile(const Filename: string): string; override;
@@ -207,9 +209,10 @@ type
     function GetOwnersOfUnit(const UnitFilename: string): TList; override;
     procedure ExtendOwnerListWithUsedByOwners(OwnerList: TList); override;
     function GetSourceFilesOfOwners(OwnerList: TList): TStrings; override;
+    function GetPackageOfCurrentSourceEditor: TPkgFile;
     function DoOpenPkgFile(PkgFile: TPkgFile): TModalResult;
     function FindVirtualUnitSource(PkgFile: TPkgFile): string;
-    function SearchFile(const ShortFilename: string;
+    function SearchFile(const AFilename: string;
                         SearchFlags: TSearchIDEFileFlags;
                         InObject: TObject): TPkgFile; override;
 
@@ -640,6 +643,15 @@ begin
   Result:=mrOk;
 end;
 
+procedure TPkgManager.OnOpenPackageForCurrentSrcEditFile(Sender: TObject);
+var
+  PkgFile: TPkgFile;
+begin
+  PkgFile:=GetPackageOfCurrentSourceEditor;
+  if PkgFile<>nil then
+    DoOpenPackage(PkgFile.LazPackage);
+end;
+
 procedure TPkgManager.MainIDEitmPkgAddCurUnitToPkgClick(Sender: TObject);
 begin
   DoAddActiveUnitToAPackage;
@@ -2090,6 +2102,18 @@ begin
   end;
 end;
 
+procedure TPkgManager.OnSourceEditorPopupMenu(AddMenuItemProc: TAddMenuItemProc
+  );
+var
+  PkgFile: TPkgFile;
+begin
+  PkgFile:=GetPackageOfCurrentSourceEditor;
+  //debugln('TPkgManager.OnSourceEditorPopupMenu ',dbgsName(PkgFile));
+  if PkgFile<>nil then
+    AddMenuItemProc('Open package '+PkgFile.LazPackage.Name,true,
+                    @OnOpenPackageForCurrentSrcEditFile);
+end;
+
 function TPkgManager.AddPackageToGraph(APackage: TLazPackage;
   Replace: boolean): TModalResult;
 var
@@ -3301,6 +3325,18 @@ begin
   end;
 end;
 
+function TPkgManager.GetPackageOfCurrentSourceEditor: TPkgFile;
+var
+  SrcEdit: TSourceEditor;
+begin
+  SrcEdit:=SourceNotebook.GetActiveSE;
+  debugln('TPkgManager.GetPackageOfCurrentSourceEditor ',SrcEdit.Filename);
+  if SrcEdit<>nil then
+    Result:=SearchFile(SrcEdit.Filename,[],nil)
+  else
+    SrcEdit:=nil;
+end;
+
 function TPkgManager.DoOpenPkgFile(PkgFile: TPkgFile): TModalResult;
 var
   Filename: String;
@@ -3327,18 +3363,22 @@ begin
   end;
 end;
 
-function TPkgManager.SearchFile(const ShortFilename: string;
+function TPkgManager.SearchFile(const AFilename: string;
   SearchFlags: TSearchIDEFileFlags; InObject: TObject): TPkgFile;
 var
   i: Integer;
+  APackage: TLazPackage;
 begin
   if InObject is TLazPackage then begin
-    Result:=TLazPackage(InObject).SearchFile(ShortFilename,SearchFlags);
+    APackage:=TLazPackage(InObject);
+    Result:=APackage.SearchFile(AFilename,SearchFlags);
     if Result<>nil then exit;
   end;
-  if siffDoNotCheckAllPackages in SearchFlags then begin
+  if not (siffDoNotCheckAllPackages in SearchFlags) then begin
     for i:=0 to PackageGraph.Count-1 do begin
-      Result:=PackageGraph[i].SearchFile(ShortFilename,SearchFlags);
+      APackage:=PackageGraph[i];
+      Result:=APackage.SearchFile(AFilename,SearchFlags);
+      debugln('TPkgManager.SearchFile ',APackage.Files[0].Filename);
       if Result<>nil then exit;
     end;
   end;