diff --git a/components/synedit/Makefile b/components/synedit/Makefile index 41149ddb74..383adb9e43 100644 --- a/components/synedit/Makefile +++ b/components/synedit/Makefile @@ -1,8 +1,7 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/27] +# Don't edit, this file is generated by FPCMake Version 1.1 [2001/12/31] # default: all -MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx override PATH:=$(subst \,/,$(PATH)) ifeq ($(findstring ;,$(PATH)),) inUnix=1 @@ -14,7 +13,10 @@ PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH)))) ifeq ($(PWD),) PWD:=$(strip $(wildcard $(addsuffix /pwd,$(SEARCHPATH)))) ifeq ($(PWD),) -$(error You need the GNU utils package to use this Makefile) +nopwd: + @echo You need the GNU utils package to use this Makefile! + @echo Get ftp://ftp.freepascal.org/pub/fpc/dist/go32v2/utilgo32.zip + @exit else PWD:=$(firstword $(PWD)) SRCEXEEXT= @@ -91,44 +93,23 @@ ifndef FPC_VERSION FPC_VERSION:=$(shell $(FPC) -iV) endif export FPC FPC_VERSION -ifeq ($(findstring 1.0.,$(FPC_VERSION)),) -COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO) -ifndef CPU_SOURCE -CPU_SOURCE:=$(word 1,$(COMPILERINFO)) -endif -ifndef CPU_TARGET -CPU_TARGET:=$(word 2,$(COMPILERINFO)) -endif -ifndef OS_SOURCE -OS_SOURCE:=$(word 3,$(COMPILERINFO)) -endif -ifndef OS_TARGET -OS_TARGET:=$(word 4,$(COMPILERINFO)) -endif -else -ifndef CPU_SOURCE -CPU_SOURCE:=$(shell $(FPC) -iSP) -endif ifndef CPU_TARGET CPU_TARGET:=$(shell $(FPC) -iTP) endif -ifndef OS_SOURCE -OS_SOURCE:=$(shell $(FPC) -iSO) +ifndef CPU_SOURCE +CPU_SOURCE:=$(shell $(FPC) -iSP) endif ifndef OS_TARGET OS_TARGET:=$(shell $(FPC) -iTO) endif +ifndef OS_SOURCE +OS_SOURCE:=$(shell $(FPC) -iSO) endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) ifneq ($(FULL_TARGET),$(FULL_SOURCE)) CROSSCOMPILE=1 endif -ifeq ($(findstring makefile,$(MAKECMDGOALS)),) -ifeq ($(findstring $(OS_TARGET),$(MAKEFILETARGETS)),) -$(error The Makefile doesn't support target $(OS_TARGET), please run fpcmake first) -endif -endif export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -138,14 +119,6 @@ endif else override FPCDIR=wrong endif -ifdef DEFAULT_FPCDIR -ifeq ($(FPCDIR),wrong) -override FPCDIR:=$(subst \,/,$(DEFAULT_FPCDIR)) -ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) -override FPCDIR=wrong -endif -endif -endif ifeq ($(FPCDIR),wrong) ifdef inUnix override FPCDIR=/usr/local/lib/fpc/$(FPC_VERSION) @@ -180,49 +153,10 @@ endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages) override PACKAGE_NAME=synedit override PACKAGE_VERSION=0.8 -override DEFAULT_LCLDIR=../../lcl -ifndef LCL_PLATFORM -ifeq ($(OS_TARGET),win32) -LCL_PLATFORM=win32 -else -LCL_PLATFORM=gtk -endif -endif -export LCL_PLATFORM -ifdef LCLDIR -override LCLDIR:=$(subst \,/,$(LCLDIR)) -ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),) -override LCLDIR=wrong -endif -else -override LCLDIR=wrong -endif -ifdef DEFAULT_LCLDIR -override LCLDIR:=$(subst \,/,$(DEFAULT_LCLDIR)) -ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),) -override LCLDIR=wrong -endif -endif -ifeq ($(LCLDIR),wrong) -override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard $(addsuffix /units/$(LCL_PLATFORM),$(BASEDIR)/lcl $(BASEDIR))))) -ifeq ($(LCLDIR),) -override LCLDIR=wrong -endif -endif -ifeq ($(LCLDIR),wrong) -override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard $(addsuffix /lib/lazarus/units/$(LCL_PLATFORM),/usr/local /usr)))) -ifeq ($(LCLDIR),) -override LCLDIR=wrong -endif -endif -override LCLUNITDIR:=$(wildcard $(LCLDIR)/units/$(LCL_PLATFORM) $(LCLDIR)/units) -override LCLCOMPONENTDIR:=$(wildcard $(LCLDIR)/.. $(LCLDIR)/../components $(LCLDIR)/components) -export LCLDIR LCLUNITDIR LCLCOMPONENTDIR -override REQUIRE_PACKAGESDIR+=$(LCLCOMPONENTDIR) -override COMPILER_UNITDIR+=$(LCLUNITDIR) -override TARGET_UNITS+=synedit syncompletion syneditautocomplete synhighlighterpas synhighlighterhtml synhighlightercpp synhighlighterxml synhighlighterlfm synhighlighterperl -override TARGET_IMPLICITUNITS+=syntextdrawer syneditkeycmds synedittypes syneditstrconst syneditsearch syneditmiscprocs syneditmiscclasses synedittextbuffer synedit synedithighlighter +override TARGET_UNITS+=allunits override COMPILER_OPTIONS+=-gl +override COMPILER_UNITDIR+=../../lcl/units/$(LCLPLATFORM) ../../lcl/units . +override COMPILER_UNITTARGETDIR+=../units ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -257,11 +191,6 @@ UNIXINSTALLDIR=1 endif endif ifndef INSTALL_PREFIX -ifdef PREFIX -INSTALL_PREFIX=$(PREFIX) -endif -endif -ifndef INSTALL_PREFIX ifdef UNIXINSTALLDIR INSTALL_PREFIX=/usr/local else @@ -750,121 +679,90 @@ else TAROPT=vz TAREXT=.tar.gz endif -override REQUIRE_PACKAGES=rtl lcl regexpr ifeq ($(OS_TARGET),linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_INET=1 REQUIRE_PACKAGES_FCL=1 -REQUIRE_PACKAGES_LCL=1 REQUIRE_PACKAGES_REGEXPR=1 REQUIRE_PACKAGES_MYSQL=1 REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_OPENGL=1 -REQUIRE_PACKAGES_GTK=1 endif ifeq ($(OS_TARGET),go32v2) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL=1 -REQUIRE_PACKAGES_LCL=1 REQUIRE_PACKAGES_REGEXPR=1 -REQUIRE_PACKAGES_OPENGL=1 -REQUIRE_PACKAGES_GTK=1 endif ifeq ($(OS_TARGET),win32) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL=1 -REQUIRE_PACKAGES_LCL=1 REQUIRE_PACKAGES_REGEXPR=1 REQUIRE_PACKAGES_MYSQL=1 REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_OPENGL=1 -REQUIRE_PACKAGES_GTK=1 endif ifeq ($(OS_TARGET),os2) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL=1 -REQUIRE_PACKAGES_LCL=1 REQUIRE_PACKAGES_REGEXPR=1 -REQUIRE_PACKAGES_OPENGL=1 -REQUIRE_PACKAGES_GTK=1 endif ifeq ($(OS_TARGET),freebsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_INET=1 REQUIRE_PACKAGES_FCL=1 -REQUIRE_PACKAGES_LCL=1 REQUIRE_PACKAGES_REGEXPR=1 REQUIRE_PACKAGES_MYSQL=1 REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_OPENGL=1 -REQUIRE_PACKAGES_GTK=1 endif ifeq ($(OS_TARGET),beos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL=1 -REQUIRE_PACKAGES_LCL=1 REQUIRE_PACKAGES_REGEXPR=1 -REQUIRE_PACKAGES_OPENGL=1 -REQUIRE_PACKAGES_GTK=1 endif ifeq ($(OS_TARGET),netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_INET=1 REQUIRE_PACKAGES_FCL=1 -REQUIRE_PACKAGES_LCL=1 REQUIRE_PACKAGES_REGEXPR=1 -REQUIRE_PACKAGES_X11=1 -REQUIRE_PACKAGES_OPENGL=1 -REQUIRE_PACKAGES_GTK=1 endif ifeq ($(OS_TARGET),amiga) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL=1 -REQUIRE_PACKAGES_LCL=1 REQUIRE_PACKAGES_REGEXPR=1 -REQUIRE_PACKAGES_OPENGL=1 -REQUIRE_PACKAGES_GTK=1 endif ifeq ($(OS_TARGET),atari) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL=1 -REQUIRE_PACKAGES_LCL=1 REQUIRE_PACKAGES_REGEXPR=1 -REQUIRE_PACKAGES_OPENGL=1 -REQUIRE_PACKAGES_GTK=1 endif ifeq ($(OS_TARGET),sunos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL=1 -REQUIRE_PACKAGES_LCL=1 REQUIRE_PACKAGES_REGEXPR=1 -REQUIRE_PACKAGES_OPENGL=1 -REQUIRE_PACKAGES_GTK=1 endif ifeq ($(OS_TARGET),qnx) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL=1 -REQUIRE_PACKAGES_LCL=1 REQUIRE_PACKAGES_REGEXPR=1 -REQUIRE_PACKAGES_OPENGL=1 -REQUIRE_PACKAGES_GTK=1 endif ifdef REQUIRE_PACKAGES_RTL -PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/$(OS_TARGET)/Makefile.fpc,$(PACKAGESDIR)))))) +PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))) ifneq ($(PACKAGEDIR_RTL),) +PACKAGEDIR_RTL:=$(firstword $(PACKAGEDIR_RTL)) +ifeq ($(wildcard $(PACKAGEDIR_RTL)/$(FPCMADE)),) +override COMPILEPACKAGES+=package_rtl +package_rtl: + $(MAKE) -C $(PACKAGEDIR_RTL) all +endif ifneq ($(wildcard $(PACKAGEDIR_RTL)/$(OS_TARGET)),) UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET) else @@ -884,8 +782,14 @@ override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif endif ifdef REQUIRE_PACKAGES_PASZLIB -PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR)))))) +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 @@ -905,8 +809,14 @@ override COMPILER_UNITDIR+=$(UNITDIR_PASZLIB) endif endif ifdef REQUIRE_PACKAGES_INET -PACKAGEDIR_INET:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /inet/Makefile.fpc,$(PACKAGESDIR)))))) +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 @@ -926,8 +836,14 @@ override COMPILER_UNITDIR+=$(UNITDIR_INET) endif endif ifdef REQUIRE_PACKAGES_FCL -PACKAGEDIR_FCL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl/Makefile.fpc,$(PACKAGESDIR)))))) +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 @@ -946,30 +862,15 @@ ifdef UNITDIR_FCL override COMPILER_UNITDIR+=$(UNITDIR_FCL) endif endif -ifdef REQUIRE_PACKAGES_LCL -PACKAGEDIR_LCL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /lcl/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_LCL),) -ifneq ($(wildcard $(PACKAGEDIR_LCL)/$(OS_TARGET)),) -UNITDIR_LCL=$(PACKAGEDIR_LCL)/$(OS_TARGET) -else -UNITDIR_LCL=$(PACKAGEDIR_LCL) -endif -else -PACKAGEDIR_LCL= -UNITDIR_LCL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /lcl/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_LCL),) -UNITDIR_LCL:=$(firstword $(UNITDIR_LCL)) -else -UNITDIR_LCL= -endif -endif -ifdef UNITDIR_LCL -override COMPILER_UNITDIR+=$(UNITDIR_LCL) -endif -endif ifdef REQUIRE_PACKAGES_REGEXPR -PACKAGEDIR_REGEXPR:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /regexpr/Makefile.fpc,$(PACKAGESDIR)))))) +PACKAGEDIR_REGEXPR:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /regexpr/Makefile.fpc,$(PACKAGESDIR))))) ifneq ($(PACKAGEDIR_REGEXPR),) +PACKAGEDIR_REGEXPR:=$(firstword $(PACKAGEDIR_REGEXPR)) +ifeq ($(wildcard $(PACKAGEDIR_REGEXPR)/$(FPCMADE)),) +override COMPILEPACKAGES+=package_regexpr +package_regexpr: + $(MAKE) -C $(PACKAGEDIR_REGEXPR) all +endif ifneq ($(wildcard $(PACKAGEDIR_REGEXPR)/$(OS_TARGET)),) UNITDIR_REGEXPR=$(PACKAGEDIR_REGEXPR)/$(OS_TARGET) else @@ -989,8 +890,14 @@ override COMPILER_UNITDIR+=$(UNITDIR_REGEXPR) endif endif ifdef REQUIRE_PACKAGES_MYSQL -PACKAGEDIR_MYSQL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /mysql/Makefile.fpc,$(PACKAGESDIR)))))) +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 @@ -1010,8 +917,14 @@ override COMPILER_UNITDIR+=$(UNITDIR_MYSQL) endif endif ifdef REQUIRE_PACKAGES_IBASE -PACKAGEDIR_IBASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /ibase/Makefile.fpc,$(PACKAGESDIR)))))) +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 @@ -1030,69 +943,7 @@ ifdef UNITDIR_IBASE override COMPILER_UNITDIR+=$(UNITDIR_IBASE) endif endif -ifdef REQUIRE_PACKAGES_X11 -PACKAGEDIR_X11:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /x11/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_X11),) -ifneq ($(wildcard $(PACKAGEDIR_X11)/$(OS_TARGET)),) -UNITDIR_X11=$(PACKAGEDIR_X11)/$(OS_TARGET) -else -UNITDIR_X11=$(PACKAGEDIR_X11) -endif -else -PACKAGEDIR_X11= -UNITDIR_X11:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /x11/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_X11),) -UNITDIR_X11:=$(firstword $(UNITDIR_X11)) -else -UNITDIR_X11= -endif -endif -ifdef UNITDIR_X11 -override COMPILER_UNITDIR+=$(UNITDIR_X11) -endif -endif -ifdef REQUIRE_PACKAGES_OPENGL -PACKAGEDIR_OPENGL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /opengl/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_OPENGL),) -ifneq ($(wildcard $(PACKAGEDIR_OPENGL)/$(OS_TARGET)),) -UNITDIR_OPENGL=$(PACKAGEDIR_OPENGL)/$(OS_TARGET) -else -UNITDIR_OPENGL=$(PACKAGEDIR_OPENGL) -endif -else -PACKAGEDIR_OPENGL= -UNITDIR_OPENGL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /opengl/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_OPENGL),) -UNITDIR_OPENGL:=$(firstword $(UNITDIR_OPENGL)) -else -UNITDIR_OPENGL= -endif -endif -ifdef UNITDIR_OPENGL -override COMPILER_UNITDIR+=$(UNITDIR_OPENGL) -endif -endif -ifdef REQUIRE_PACKAGES_GTK -PACKAGEDIR_GTK:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /gtk/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_GTK),) -ifneq ($(wildcard $(PACKAGEDIR_GTK)/$(OS_TARGET)),) -UNITDIR_GTK=$(PACKAGEDIR_GTK)/$(OS_TARGET) -else -UNITDIR_GTK=$(PACKAGEDIR_GTK) -endif -else -PACKAGEDIR_GTK= -UNITDIR_GTK:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /gtk/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_GTK),) -UNITDIR_GTK:=$(firstword $(UNITDIR_GTK)) -else -UNITDIR_GTK= -endif -endif -ifdef UNITDIR_GTK -override COMPILER_UNITDIR+=$(UNITDIR_GTK) -endif -endif +.PHONY: package_rtl package_paszlib package_inet package_fcl package_regexpr package_mysql package_ibase ifndef NOCPUDEF override FPCOPTDEF=$(CPU_TARGET) endif @@ -1212,26 +1063,24 @@ endif ifdef TARGET_UNITS override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) -override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) -override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) +override INSTALLPPUFILES+=$(UNITPPUFILES) +override CLEANPPUFILES+=$(UNITPPUFILES) endif fpc_units: $(UNITPPUFILES) ifdef TARGET_RSTS override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS)) override CLEANRSTFILES+=$(RSTFILES) endif -.PHONY: fpc_all fpc_smart fpc_debug fpc_release +.PHONY: fpc_packages fpc_all fpc_smart fpc_debug $(FPCMADE): $(ALLTARGET) @$(ECHOREDIR) Compiled > $(FPCMADE) -fpc_all: $(FPCMADE) +fpc_packages: $(COMPILEPACKAGES) +fpc_all: fpc_packages $(FPCMADE) fpc_smart: $(MAKE) all LINKSMART=1 CREATESMART=1 fpc_debug: $(MAKE) all DEBUG=1 -fpc_release: - $(MAKE) all RELEASE=1 -.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .pp .rc .res +.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .pp %$(PPUEXT): %.pp $(COMPILER) $< $(EXECPPAS) @@ -1244,8 +1093,6 @@ fpc_release: %$(EXEEXT): %.pas $(COMPILER) $< $(EXECPPAS) -%.res: %.rc - windres -i $< -o $@ vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR) vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR) vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR) @@ -1253,9 +1100,6 @@ vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR) ifdef INSTALL_UNITS override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS)) endif -ifdef INSTALL_BUILDUNIT -override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES)) -endif ifdef INSTALLPPUFILES override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPUFILES)) @@ -1436,13 +1280,12 @@ ifdef CLEANEXEFILES endif -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) -$(DELTREE) *$(SMARTEXT) - -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) ifdef AOUTEXT -$(DEL) *$(AOUTEXT) endif -.PHONY: fpc_baseinfo -override INFORULES+=fpc_baseinfo -fpc_baseinfo: +.PHONY: fpc_info +fpc_info: @$(ECHO) @$(ECHO) == Package info == @$(ECHO) Package Name..... $(PACKAGE_NAME) @@ -1461,8 +1304,6 @@ fpc_baseinfo: @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) - @$(ECHO) Required pkgs... $(REQUIRE_PACKAGES) - @$(ECHO) @$(ECHO) Basedir......... $(BASEDIR) @$(ECHO) FPCDir.......... $(FPCDIR) @$(ECHO) CrossBinDir..... $(CROSSBINDIR) @@ -1492,13 +1333,12 @@ fpc_baseinfo: @$(ECHO) @$(ECHO) == Object info == @$(ECHO) - @$(ECHO) Target Loaders........ $(TARGET_LOADERS) - @$(ECHO) Target Units.......... $(TARGET_UNITS) - @$(ECHO) Target Implicit Units. $(TARGET_IMPLICITUNITS) - @$(ECHO) Target Programs....... $(TARGET_PROGRAMS) - @$(ECHO) Target Dirs........... $(TARGET_DIRS) - @$(ECHO) Target Examples....... $(TARGET_EXAMPLES) - @$(ECHO) Target ExampleDirs.... $(TARGET_EXAMPLEDIRS) + @$(ECHO) Target Loaders...... $(TARGET_LOADERS) + @$(ECHO) Target Units........ $(TARGET_UNITS) + @$(ECHO) Target Programs..... $(TARGET_PROGRAMS) + @$(ECHO) Target Dirs......... $(TARGET_DIRS) + @$(ECHO) Target Examples..... $(TARGET_EXAMPLES) + @$(ECHO) Target ExampleDirs.. $(TARGET_EXAMPLEDIRS) @$(ECHO) @$(ECHO) Clean Units......... $(CLEAN_UNITS) @$(ECHO) Clean Files......... $(CLEAN_FILES) @@ -1525,36 +1365,8 @@ fpc_baseinfo: @$(ECHO) Dist destination dir. $(DIST_DESTDIR) @$(ECHO) Dist zip name........ $(DIST_ZIPNAME) @$(ECHO) -override INFORULES+=lclinfo -.PHONY: lclinfo -lclinfo: - @$(ECHO) == LCL info == - @$(ECHO) - @$(ECHO) Platform............. $(LCL_PLATFORM) - @$(ECHO) LCLDIR............... $(LCLDIR) - @$(ECHO) LCL Unit dir......... $(LCLUNITDIR) - @$(ECHO) LCL Component dir.... $(LCLCOMPONENTDIR) - @$(ECHO) -.PHONY: fpc_info -fpc_info: $(INFORULES) -.PHONY: fpc_makefile fpc_makefiles fpc_makefile_sub1 fpc_makefile_sub2 \ - fpc_makefile_dirs -fpc_makefile: - $(FPCMAKE) -w -T$(OS_TARGET) Makefile.fpc -fpc_makefile_sub1: -ifdef TARGET_DIRS - $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TARGET_DIRS)) -endif -ifdef TARGET_EXAMPLEDIRS - $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TARGET_EXAMPLEDIRS)) -endif -fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) -fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 -fpc_makefiles: fpc_makefile fpc_makefile_dirs -all: fpc_all debug: fpc_debug smart: fpc_smart -release: fpc_release examples: shared: install: fpc_install @@ -1569,8 +1381,11 @@ clean: fpc_clean distclean: fpc_distclean cleanall: fpc_cleanall info: fpc_info -makefiles: fpc_makefiles -.PHONY: all debug smart release examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info makefiles +.PHONY: debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info ifneq ($(wildcard fpcmake.loc),) include fpcmake.loc endif +.PHONY: cleartarget all +cleartarget: + -$(DEL) $(COMPILER_UNITTARGETDIR)/allunits$(PPUEXT) +all: cleartarget allunits$(PPUEXT) diff --git a/components/synedit/Makefile.fpc b/components/synedit/Makefile.fpc index 046e2b3da2..74c1d10b6c 100644 --- a/components/synedit/Makefile.fpc +++ b/components/synedit/Makefile.fpc @@ -7,19 +7,28 @@ name=synedit version=0.8 +[compiler] +unitdir=../../lcl/units/$(LCLPLATFORM) ../../lcl/units . +unittargetdir=../units +options=-gl + + [target] -units=synedit syncompletion syneditautocomplete \ - synhighlighterpas synhighlighterhtml synhighlightercpp \ - synhighlighterxml synhighlighterlfm synhighlighterperl +units=allunits implicitunits=syntextdrawer syneditkeycmds synedittypes syneditstrconst \ syneditsearch syneditmiscprocs syneditmiscclasses synedittextbuffer \ synedit synedithighlighter [require] -packages=lcl regexpr +packages=fcl regexpr [default] lcldir=../../lcl -[compiler] -options=-gl +[rules] +.PHONY: cleartarget all + +cleartarget: + -$(DEL) $(COMPILER_UNITTARGETDIR)/allunits$(PPUEXT) + +all: cleartarget allunits$(PPUEXT)