MWE:

Made makefile.fpc files compatible with new fpcmake util. git-svn-id: trunk@331 -
2025-04-05 18:18:02 +02:00 · 2001-08-13 23:34:05 +00:00 · 2001-08-13 23:34:05 +00:00 · 17b5939905
commit 17b5939905
parent d681f7778c
20 changed files with 6073 additions and 8208 deletions
--- a/1951
+++ b/1951
--- a/Makefile.fpc
+++ b/Makefile.fpc
@ -2,58 +2,75 @@
 #   Makefile.fpc for Lazarus for Free Pascal
 #

-[targets]
-programs=lazarus
-dirs=lcl components 
-exampledirs=examples
-
-[clean]
-units=$(basename $(wildcard *$(PPUEXT))) $(basename $(wildcard ./designer/*$(PPUEXT))) $(basename $(wildcard ./debugger/*$(PPUEXT)))
-files=$(wildcard ./designer/*$(OEXT))
+[package]
+name=lazarus
+version=0.7a

 [require]
-rtl=1
-options=-gl
-packages=fcl gtk
+#rtl=1
+#options=-gl
+packages=rtl fcl gtk 

-[dirs]
-# not with the lazarusmake.ini
-# targetdir=.
+[target]
+programs=lazarus
+dirs=lcl components tools
+exampledirs=examples
+
+[compiler]
+options=-gl
 unitdir=. ./lcl/units ./lcl/units/$(LCLPLATFORM) ./components/units ./designer ./debugger
-incdir=. ./include ./include/$(OS_TARGET)
+includedir=. ./include ./include/$(OS_TARGET)
+       
+[clean]
+#units=$(basename $(wildcard *$(PPUEXT))) $(basename $(wildcard ./designer/*$(PPUEXT))) $(basename $(wildcard ./debugger/*$(PPUEXT)))
+#files=$(wildcard ./designer/*$(OEXT))

 [install]
-packagename=lazarus
+basedir=lib/lazarus
+#prefixdir=/usr
+
+[prerules]
+DIST_DESTDIR=$(BASEDIR)/dist

-[presettings]
 ifndef LCLPLATFORM
 LCLPLATFORM=gtk
 export LCLPLATFORM
 endif

-
 [rules]
-.PHONY: examples lcl components ide tools
+.SUFFIXES: .rc .res
+%.res: %.rc
+        windres -i $< -o $@ 
+
+
+.PHONY: examples lcl components ide tools all win32

 lcl: lcl_all 

-examples: lcl
-        $(MAKE) -C examples
+examples: lcl examples_all

 components: lcl components_all

 ide: 
        $(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT)

-tools: lcl components 
-        $(MAKE) -C tools
+tools: lcl components tools_all

 all: lcl components ide

-# Win32-specific rules
 win32:
-	$(MAKE) lazarus.res
-	$(MAKE) .PHONY LCLPLATFORM=win32 OPT=-dSUPPORTS_RESOURCES
+        $(MAKE) lazarus.res
+        $(MAKE) all LCLPLATFORM=win32 OPT=-dSUPPORTS_RESOURCES
+
+# MWE: moved to a more generic rule
+#lazarus.res: lazarus.rc
+#	windres -i lazarus.rc -o lazarus.res
+
+makefile: Makefile.fpc
+        -$(FPCMAKE) -w
+
+makefiles: makefile
+        $(MAKE) -C components makefiles
+        $(MAKE) -C lcl makefiles
+        $(MAKE) -C tools makefiles

-lazarus.res: lazarus.rc
-	windres -i lazarus.rc -o lazarus.res
--- a/components/Makefile
+++ b/components/Makefile
--- a/components/Makefile.fpc
+++ b/components/Makefile.fpc
@ -3,27 +3,30 @@
 #   Makefile.fpc for Lazarus for Free Pascal
 #

-[targets]
-dirs=synedit mwedit
+[package]
+name=lazarus-components
+version=0.7a

-[dirs]
-# target dir needs to be . or a full path otherwise the 
-# unittargetdir will be corrupt
-# not with the lazarusmake.ini
-# targetdir=.
-unittargetdir=./units
+[target]
+#dirs=synedit mwedit
+dirs=synedit 

 [install]
-units=$(notdir $(basename $(wildcard $(UNITTARGETDIR)/*$(PPUEXT))))
-packagename=components

-
-[presettings]
+[prerules]
+DIST_DESTDIR=$(BASEDIR)/../dist
 ifndef LCLPLATFORM
 LCLPLATFORM=gtk
 export LCLPLATFORM
 endif

-[postsettings]
-
 [rules]
+.PHONY: all makefile makefiles
+
+makefile: Makefile.fpc
+        -$(FPCMAKE) -w
+        
+makefiles: makefile
+        $(MAKE) -C mwedit makefiles
+        $(MAKE) -C synedit makefiles
+
--- a/components/synedit/Makefile
+++ b/components/synedit/Makefile
--- a/components/synedit/Makefile.fpc
+++ b/components/synedit/Makefile.fpc
@ -3,33 +3,45 @@
 #   Makefile.fpc for Lazarus for Free Pascal
 #

-[targets]
-# units=allunits
+[package]
+#name=lazarus-synedit
+name=lazarus
+version=0.7a
+
+[target]
+units=syntextdrawer syneditkeycmds synedittypes syneditstrconst \
+  syneditsearch syneditmiscprocs syneditmiscclasses synedittextbuffer \
+  synedit synedithighlighter synhighlighterpas syncompletion \
+  syneditautocomplete synhighlighterhtml synhighlightercpp
+
+[default]
+            
+[compiler]
+options=-gl  
+unittargetdir=../units
+unitdir=$(COMPILER_UNITTARGETDIR) ../../lcl/units ../../lcl/units/$(LCLPLATFORM)

 [require]
-rtl=1
-options=-Ca -gl
-packages=fcl gtk
+packages=rtl fcl

 [clean]
-units=$(notdir $(basename $(wildcard $(UNITTARGETDIR)/*$(PPUEXT))))
-# not with the lazarusmake.ini
-# files=$(wildcard $(UNITTARGETDIR)/*$(OEXT))

-[dirs]
-# target dir needs to be . or a full path otherwise the 
-# unittargetdir will be corrupt
-# not with the lazarusmake.ini
-# targetdir=.
-unittargetdir=../units
-unitdir=$(UNITTARGETDIR) ../../lcl/units ../../lcl/units/$(LCLPLATFORM)
+[install]

-[libs]
+[dist]
+zipname=lazarus.synedit.$(ZIPSUFFIX)

 [rules]
+.PHONY: cleartarget all makefile makefiles
+
 cleartarget:
-        -$(DEL) $(UNITTARGETDIR)/allunits$(PPUEXT)
+        -$(DEL) $(COMPILER_UNITTARGETDIR)/allunits$(PPUEXT)

 all: cleartarget allunits$(PPUEXT)
-        -$(DEL) $(UNITTARGETDIR)/allunits$(PPUEXT)
+        -$(DEL) $(COMPILER_UNITTARGETDIR)/allunits$(PPUEXT)
+
+makefile: Makefile.fpc
+        -$(FPCMAKE) -w
+       
+makefiles: makefile

--- a/examples/Makefile
+++ b/examples/Makefile
--- a/examples/Makefile.fpc
+++ b/examples/Makefile.fpc
@ -2,36 +2,39 @@
 #   Makefile.fpc for LCL Examples for Free Pascal
 #

-[targets]
-programs=hello notebk comdialogs progressbar trackbar listboxtest \
-         bitbutton combobox checkbox selection scrollbar testall
+[package]
+name=lazarus-examples
+version=0.7a
+
+[target]
+examples=hello notebk comdialogs progressbar trackbar listboxtest \
+         bitbutton combobox checkbox scrollbar testall

 [clean]
-units=$(notdir $(basename $(wildcard *$(PPUEXT)))) 
+#units=$(notdir $(basename $(wildcard *$(PPUEXT)))) 

-[require]
-rtl=1
-options=-gl
-packages=fcl gtk
-
-[dirs]
-# not with the lazarusmake.ini
-# targetdir=.
+[default]
+            
+[compiler]
+options=-gl  
 unitdir=. ../lcl/units ../components/units ../designer ../lcl/units/$(LCLPLATFORM)

-[install]
-units=$(basename $(wildcard $(UNITTARGETDIR)/*$(PPUEXT)))
-packagename=examples

-[presettings]
+[prerules]
 ifndef LCLPLATFORM
 LCLPLATFORM=gtk
 endif

-[libs]
-
 [rules]
-cleartarget:
-        -$(DEL) $(addsuffix $(EXEEXT), $(EXEOBJECTS))
+.PHONY: cleartarget all makefiles makefile
+
+cleartarget:
+        -$(DEL) $(EXAMPLEFILES)
+
+all: cleartarget $(EXAMPLEFILES)
+
+makefile: Makefile.fpc
+        -$(FPCMAKE) -w
+       
+makefiles: makefile

-all: cleartarget $(addsuffix $(EXEEXT), $(EXEOBJECTS))
--- a/lcl/Makefile
+++ b/lcl/Makefile
--- a/lcl/Makefile.fpc
+++ b/lcl/Makefile.fpc
@ -3,46 +3,57 @@
 #   Makefile.fpc for Lazarus for Free Pascal
 #

-[targets]
-# units=allunits
-# loaders=allunits
+[package]
+name=lazarus
+#name=lazarus-lcl
+version=0.7a
+
+[target]                                 
+dirs=interfaces
+units=buttons clipbrd clistbox comctrls controls dialogs dynhasharray \
+      extctrls filectrl forms graphics imglist interfacebase lazqueue \
+      lcllinux lmessages lresources menus messages registry spin \
+      stdctrls toolwin utrace vclglobals
+            
+[default]
+            
+[compiler]
+options=-gl  
+unittargetdir=./units
+unitdir=$(COMPILER_UNITTARGETDIR) ./interfaces/abstract 
+includedir=./include 

 [require]
-rtl=1
-options=-Ca -gl
-packages=fcl gtk

 [clean]
-units=$(notdir $(basename $(wildcard $(UNITTARGETDIR)/*$(PPUEXT))))
-# not with the lazarusmake.ini
-# files=$(wildcard $(UNITTARGETDIR)/*$(OEXT))
-
-[dirs]
-# target dir needs to be . or a full path otherwise the 
-# unittargetdir will be corrupt
-# not with the lazarusmake.ini
-# targetdir=.
-unittargetdir=./units
-unitdir=$(UNITTARGETDIR) ./interfaces/abstract 
-incdir=./include 

 [install]
-units=$(notdir $(basename $(wildcard $(UNITTARGETDIR)/*$(PPUEXT))))
-packagename=lcl
+#prefixdir=/usr
+#basedir=$(PACKDIR)/lib/lazarus
+
+[dist]
+zipname=lazarus.lcl.$(ZIPSUFFIX)

 [libs]

-[presettings]
+[prerules]
+DIST_DESTDIR=$(BASEDIR)/../dist
+                     
+[rules]         
+.PHONY: cleartarget all makefile makefiles

-[defaults]
-
-[rules]
 cleartarget:
-        -$(DEL) $(UNITTARGETDIR)/allunits$(PPUEXT)
+        -$(DEL) $(COMPILER_UNITTARGETDIR)/allunits$(PPUEXT)

 all: cleartarget allunits$(PPUEXT)
-        -$(DEL) $(UNITTARGETDIR)/allunits$(PPUEXT)
-        -$(DEL) $(UNITTARGETDIR)/interfaces$(PPUEXT)
-        -$(DEL) $(UNITTARGETDIR)/interfaces$(OEXT)
+        -$(DEL) $(COMPILER_UNITTARGETDIR)/allunits$(PPUEXT)
+        -$(DEL) $(COMPILER_UNITTARGETDIR)/interfaces$(PPUEXT)
+        -$(DEL) $(COMPILER_UNITTARGETDIR)/interfaces$(OEXT)
        $(MAKE) -C interfaces

+makefile: Makefile.fpc
+        -$(FPCMAKE) -w
+        
+makefiles: makefile
+        $(MAKE) -C interfaces makefiles
+        
--- a/lcl/interfaces/Makefile
+++ b/lcl/interfaces/Makefile
--- a/lcl/interfaces/Makefile.fpc
+++ b/lcl/interfaces/Makefile.fpc
@ -3,26 +3,31 @@
 #   Makefile.fpc for Lazarus for Free Pascal
 #

-[targets]
+[package]
+name=lazarus-interface
+version=0.7a
+
+[target]
 dirs=gtk qt win32

-[dirs]
-# target dir needs to be . or a full path otherwise the 
-# unittargetdir will be corrupt
-# not with the lazarusmake.ini
-# targetdir=.
+[default]
+dir=$(LCLPLATFORM)

-[defaults]
-defaultdir=$(LCLPLATFORM)
+[prerules]
+DIST_DESTDIR=$(BASEDIR)/../../dist

-[install]
-packagename=interfaces
-
-[presettings]
+[prerules]
 ifndef LCLPLATFORM
 LCLPLATFORM=gtk
 endif

-[postsettings]
-
 [rules]
+.PHONY: makefile makefiles
+
+makefile: Makefile.fpc
+        -$(FPCMAKE) -w
+        
+makefiles: makefile
+        $(MAKE) -C gtk makefiles
+        $(MAKE) -C qt makefiles
+        $(MAKE) -C win32 makefiles
--- a/lcl/interfaces/gtk/Makefile
+++ b/lcl/interfaces/gtk/Makefile
--- a/lcl/interfaces/gtk/Makefile.fpc
+++ b/lcl/interfaces/gtk/Makefile.fpc
@ -2,41 +2,34 @@
 #
 #   Makefile.fpc for Lazarus for Free Pascal
 #
-
-[targets]
-units=interfaces
+     
+[package]
+name=lazarus
+#name=lazarus-gtk
+version=0.7a

 [require]
-rtl=1
-options=-Ca -gl
-packages=fcl gtk
+packages=rtl fcl gtk

-[clean]
-units=$(notdir $(basename $(wildcard $(UNITTARGETDIR)/*$(PPUEXT))))
-# not with the lazarusmake.ini
-# files=$(wildcard $(UNITTARGETDIR)/*$(OEXT))
+[target]
+units=interfaces

-[dirs]
-# target dir needs to be . or a full path otherwise the 
-# unittargetdir will be corrupt
-# not with the lazarusmake.ini
-# targetdir=.
+[compiler]
+options=-gl
 unittargetdir=../../units/gtk
-unitdir=$(UNITTARGETDIR) ../../units 
-incdir=.
-
-[install]
-units=$(notdir $(basename $(wildcard $(UNITTARGETDIR)/*$(PPUEXT))))
-packagename=gtkinterface
-
-[libs]
-
-[presettings]
-
-[defaults]
-
+unitdir=$(COMPILER_UNITTARGETDIR) ../../units 
+includedir=.
+            
+[prerules]
+DIST_DESTDIR=$(BASEDIR)/../../../dist
+            
 [rules]
-
+.PHONY: all makefile makefiles

 all: 
-        $(MAKE) --assume-new=interfaces$(PASEXT) interfaces$(PPUEXT)
+        $(MAKE) --assume-new=interfaces.pp interfaces$(PPUEXT)
+
+makefile: Makefile.fpc
+        -$(FPCMAKE) -w
+       
+makefiles: makefile
--- a/lcl/interfaces/win32/Makefile
+++ b/lcl/interfaces/win32/Makefile
@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/07]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/08]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@ -106,7 +106,6 @@ endif
 else
 override FPCDIR=wrong
 endif
-
 ifeq ($(FPCDIR),wrong)
 ifdef inUnix
 override FPCDIR=/usr/local/lib/fpc/$(FPC_VERSION)
@ -126,13 +125,14 @@ endif
 endif
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
-override PACKAGE_NAME=win32interface
-override PACKAGE_VERSION=0.7
-override FPCOPT+=-gl -Or -S2h
+override PACKAGE_NAME=lazarus-win32
+override PACKAGE_VERSION=0.7a
+DIST_DESTDIR=$(BASEDIR)/../../../dist
 override TARGET_UNITS+=interfaces
-override INSTALL_FPCPACKAGE=n
-override COMPILER_UNITDIR+=$(TARGETDIR) ../../units
-override COMPILER_TARGETDIR+=../../units/win32
+override COMPILER_OPTIONS+=-gl -Or -S2h
+override COMPILER_INCLUDEDIR+=.
+override COMPILER_UNITDIR+=$(COMPILER_UNITTARGETDIR) ../../units
+override COMPILER_UNITTARGETDIR+=../../units/win32
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@ -523,29 +523,62 @@ endif
 ifndef INSTALL_DATADIR
 INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
+ifdef inUnix
+ifndef GCCLIBDIR
+GCCLIBDIR:=$(shell dirname `(gcc -v 2>&1)| head -n 1| awk '{ print $$4 } '`)
+endif
+ifndef OTHERLIBDIR
+OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }')
+endif
+export GCCLIBDIR OTHERLIB
+endif
 ifeq ($(OS_TARGET),linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_INET=1
+REQUIRE_PACKAGES_FCL=1
+REQUIRE_PACKAGES_MYSQL=1
+REQUIRE_PACKAGES_IBASE=1
 endif
 ifeq ($(OS_TARGET),go32v2)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL=1
 endif
 ifeq ($(OS_TARGET),win32)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL=1
+REQUIRE_PACKAGES_MYSQL=1
+REQUIRE_PACKAGES_IBASE=1
 endif
 ifeq ($(OS_TARGET),os2)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL=1
 endif
 ifeq ($(OS_TARGET),freebsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_INET=1
+REQUIRE_PACKAGES_FCL=1
+REQUIRE_PACKAGES_MYSQL=1
+REQUIRE_PACKAGES_IBASE=1
 endif
 ifeq ($(OS_TARGET),beos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL=1
 endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL=1
 endif
 ifeq ($(OS_TARGET),atari)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL=1
 endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
@ -574,7 +607,142 @@ ifdef UNITDIR_RTL
 override COMPILER_UNITDIR+=$(UNITDIR_RTL)
 endif
 endif
-.PHONY: package_rtl
+ifdef REQUIRE_PACKAGES_PASZLIB
+PACKAGEDIR_PASZLIB:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR)))))
+ifneq ($(PACKAGEDIR_PASZLIB),)
+PACKAGEDIR_PASZLIB:=$(firstword $(PACKAGEDIR_PASZLIB))
+ifeq ($(wildcard $(PACKAGEDIR_PASZLIB)/$(FPCMADE)),)
+override COMPILEPACKAGES+=package_paszlib
+package_paszlib:
+	$(MAKE) -C $(PACKAGEDIR_PASZLIB) all
+endif
+ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/$(OS_TARGET)),)
+UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/$(OS_TARGET)
+else
+UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)
+endif
+else
+PACKAGEDIR_PASZLIB=
+UNITDIR_PASZLIB:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_PASZLIB),)
+UNITDIR_PASZLIB:=$(firstword $(UNITDIR_PASZLIB))
+else
+UNITDIR_PASZLIB=
+endif
+endif
+ifdef UNITDIR_PASZLIB
+override COMPILER_UNITDIR+=$(UNITDIR_PASZLIB)
+endif
+endif
+ifdef REQUIRE_PACKAGES_INET
+PACKAGEDIR_INET:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /inet/Makefile.fpc,$(PACKAGESDIR)))))
+ifneq ($(PACKAGEDIR_INET),)
+PACKAGEDIR_INET:=$(firstword $(PACKAGEDIR_INET))
+ifeq ($(wildcard $(PACKAGEDIR_INET)/$(FPCMADE)),)
+override COMPILEPACKAGES+=package_inet
+package_inet:
+	$(MAKE) -C $(PACKAGEDIR_INET) all
+endif
+ifneq ($(wildcard $(PACKAGEDIR_INET)/$(OS_TARGET)),)
+UNITDIR_INET=$(PACKAGEDIR_INET)/$(OS_TARGET)
+else
+UNITDIR_INET=$(PACKAGEDIR_INET)
+endif
+else
+PACKAGEDIR_INET=
+UNITDIR_INET:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /inet/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_INET),)
+UNITDIR_INET:=$(firstword $(UNITDIR_INET))
+else
+UNITDIR_INET=
+endif
+endif
+ifdef UNITDIR_INET
+override COMPILER_UNITDIR+=$(UNITDIR_INET)
+endif
+endif
+ifdef REQUIRE_PACKAGES_FCL
+PACKAGEDIR_FCL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl/Makefile.fpc,$(PACKAGESDIR)))))
+ifneq ($(PACKAGEDIR_FCL),)
+PACKAGEDIR_FCL:=$(firstword $(PACKAGEDIR_FCL))
+ifeq ($(wildcard $(PACKAGEDIR_FCL)/$(FPCMADE)),)
+override COMPILEPACKAGES+=package_fcl
+package_fcl:
+	$(MAKE) -C $(PACKAGEDIR_FCL) all
+endif
+ifneq ($(wildcard $(PACKAGEDIR_FCL)/$(OS_TARGET)),)
+UNITDIR_FCL=$(PACKAGEDIR_FCL)/$(OS_TARGET)
+else
+UNITDIR_FCL=$(PACKAGEDIR_FCL)
+endif
+else
+PACKAGEDIR_FCL=
+UNITDIR_FCL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_FCL),)
+UNITDIR_FCL:=$(firstword $(UNITDIR_FCL))
+else
+UNITDIR_FCL=
+endif
+endif
+ifdef UNITDIR_FCL
+override COMPILER_UNITDIR+=$(UNITDIR_FCL)
+endif
+endif
+ifdef REQUIRE_PACKAGES_MYSQL
+PACKAGEDIR_MYSQL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /mysql/Makefile.fpc,$(PACKAGESDIR)))))
+ifneq ($(PACKAGEDIR_MYSQL),)
+PACKAGEDIR_MYSQL:=$(firstword $(PACKAGEDIR_MYSQL))
+ifeq ($(wildcard $(PACKAGEDIR_MYSQL)/$(FPCMADE)),)
+override COMPILEPACKAGES+=package_mysql
+package_mysql:
+	$(MAKE) -C $(PACKAGEDIR_MYSQL) all
+endif
+ifneq ($(wildcard $(PACKAGEDIR_MYSQL)/$(OS_TARGET)),)
+UNITDIR_MYSQL=$(PACKAGEDIR_MYSQL)/$(OS_TARGET)
+else
+UNITDIR_MYSQL=$(PACKAGEDIR_MYSQL)
+endif
+else
+PACKAGEDIR_MYSQL=
+UNITDIR_MYSQL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /mysql/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_MYSQL),)
+UNITDIR_MYSQL:=$(firstword $(UNITDIR_MYSQL))
+else
+UNITDIR_MYSQL=
+endif
+endif
+ifdef UNITDIR_MYSQL
+override COMPILER_UNITDIR+=$(UNITDIR_MYSQL)
+endif
+endif
+ifdef REQUIRE_PACKAGES_IBASE
+PACKAGEDIR_IBASE:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /ibase/Makefile.fpc,$(PACKAGESDIR)))))
+ifneq ($(PACKAGEDIR_IBASE),)
+PACKAGEDIR_IBASE:=$(firstword $(PACKAGEDIR_IBASE))
+ifeq ($(wildcard $(PACKAGEDIR_IBASE)/$(FPCMADE)),)
+override COMPILEPACKAGES+=package_ibase
+package_ibase:
+	$(MAKE) -C $(PACKAGEDIR_IBASE) all
+endif
+ifneq ($(wildcard $(PACKAGEDIR_IBASE)/$(OS_TARGET)),)
+UNITDIR_IBASE=$(PACKAGEDIR_IBASE)/$(OS_TARGET)
+else
+UNITDIR_IBASE=$(PACKAGEDIR_IBASE)
+endif
+else
+PACKAGEDIR_IBASE=
+UNITDIR_IBASE:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /ibase/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_IBASE),)
+UNITDIR_IBASE:=$(firstword $(UNITDIR_IBASE))
+else
+UNITDIR_IBASE=
+endif
+endif
+ifdef UNITDIR_IBASE
+override COMPILER_UNITDIR+=$(UNITDIR_IBASE)
+endif
+endif
+.PHONY: package_rtl package_paszlib package_inet package_fcl package_mysql package_ibase
 override FPCOPTDEF=$(CPU_TARGET)
 ifneq ($(OS_TARGET),$(OS_SOURCE))
 override FPCOPT+=-T$(OS_TARGET)
@ -642,7 +810,7 @@ override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
 ifeq ($(COMPILER_UNITTARGETDIR),.)
 override UNITTARGETDIRPREFIX=
 else
-override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
 endif
 else
 ifdef COMPILER_TARGETDIR
@ -650,6 +818,12 @@ override COMPILER_UNITTARGETDIR=$(COMPILER_TARGETDIR)
 override UNITTARGETDIRPREFIX=$(TARGETDIRPREFIX)
 endif
 endif
+ifdef GCCLIBDIR
+override FPCOPT+=-Fl$(GCCLIBDIR)
+endif
+ifdef OTHERLIBDIR
+override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
+endif
 ifdef OPT
 override FPCOPT+=$(OPT)
 endif
@ -734,7 +908,7 @@ ifdef INSTALL_CREATEPACKAGEFPC
 ifdef FPCMAKE
 ifdef PACKAGE_VERSION
 ifneq ($(wildcard Makefile.fpc),)
-	$(FPCMAKE) -p -T$(OS_TARGET) Makefile.fpc
+	$(FPCMAKE) -p Makefile.fpc
 	$(MKDIR) $(INSTALL_UNITDIR)
 	$(INSTALL) Package.fpc $(INSTALL_UNITDIR)
 endif
@ -990,5 +1164,9 @@ info: fpc_info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
-all:
-	$(MAKE) --assume-new=interfaces$(PASEXT) interfaces$(PPUEXT)
+.PHONY: all makefile makefiles
+all: 
+	$(MAKE) --assume-new=interfaces.pp interfaces$(PPUEXT)
+makefile: Makefile.fpc
+	-$(FPCMAKE) -w
+makefiles: makefile
--- a/lcl/interfaces/win32/Makefile.fpc
+++ b/lcl/interfaces/win32/Makefile.fpc
@ -4,26 +4,31 @@
 #

 [package]
-name=win32interface
-version=0.7
+name=lazarus-win32
+version=0.7a
+
+[require]
+packages=rtl fcl

 [target]
 units=interfaces
-incdir=.

 [compiler]
-targetdir=../../units/win32
-unitdir=$(TARGETDIR) ../../units
-
-[install]
-fpcpackage=n
-
-[default]
-fpcdir=C:\FreePascal\cvs\fpc
+options=-gl -Or -S2h
+unittargetdir=../../units/win32
+unitdir=$(COMPILER_UNITTARGETDIR) ../../units 
+includedir=.

 [prerules]
-override FPCOPT+=-gl -Or -S2h
+DIST_DESTDIR=$(BASEDIR)/../../../dist

 [rules]
-all:
-        $(MAKE) --assume-new=interfaces$(PASEXT) interfaces$(PPUEXT)
+.PHONY: all makefile makefiles
+
+all: 
+        $(MAKE) --assume-new=interfaces.pp interfaces$(PPUEXT)
+
+makefile: Makefile.fpc
+        -$(FPCMAKE) -w
+       
+makefiles: makefile
--- a/tools/Makefile
+++ b/tools/Makefile
--- a/tools/Makefile.fpc
+++ b/tools/Makefile.fpc
@ -3,25 +3,21 @@
 #   Makefile.fpc for Lazarus for Free Pascal
 #

-[targets]
-dirs=apiwizz
+[package]
+name=lazarus-tools
+version=0.7a

-[dirs]
-# target dir needs to be . or a full path otherwise the 
-# unittargetdir will be corrupt
-# not with the lazarusmake.ini
-# targetdir=.
+[target]
+dirs=apiwizz

 [install]
 packagename=tools

-[presettings]
-ifndef LCLPLATFORM
-LCLPLATFORM=gtk
-export LCLPLATFORM
-endif
-
-
-[postsettings]
-
 [rules]
+.PHONY: makefile makefiles
+
+makefile: Makefile.fpc
+        -$(FPCMAKE) -w
+        
+makefiles: makefile
+        $(MAKE) -C apiwizz makefiles
--- a/tools/apiwizz/Makefile
+++ b/tools/apiwizz/Makefile
--- a/tools/apiwizz/Makefile.fpc
+++ b/tools/apiwizz/Makefile.fpc
@ -2,26 +2,35 @@
 #   Makefile.fpc for APIWizard for Free Pascal
 #

-[targets]
+[package]
+name=lazarus-apiwizz
+version=0.7a
+
+[target]
 programs=apiwizz

-[clean]
-units=apiwizard
-
 [require]
-rtl=1
-packages=fcl gtk
+packages=rtl fcl

-[presettings]
-LAZDIR=../..
+[clean]
+#units=apiwizard

-[dirs]
-targetdir=.
+[compiler]
+options=-gl
 unitdir=. $(LAZDIR)/lcl/units $(LAZDIR)/components/units $(LAZDIR)/lcl/units/$(LCLPLATFORM)
+targetdir=.

-[libs]
+[prerules]
+LAZDIR=../..


 [rules]
+.PHONY: all makefile makefiles
+
 all: 
        $(MAKE) --assume-new=apiwizz.pp apiwizz$(EXEEXT)
+
+makefile: Makefile.fpc
+        -$(FPCMAKE) -w
+       
+makefiles: makefile