From 206ae47ad5bb9201a713f739c2dbad86ce19cd4a Mon Sep 17 00:00:00 2001 From: peter Date: Tue, 18 Jan 2000 00:25:15 +0000 Subject: [PATCH] * regenerate for win32 fix --- api/Makefile | 2 +- api/go32v2/Makefile | 3 +- api/linux/Makefile | 3 +- api/win32/Makefile | 3 +- base/Makefile | 106 ++++++++++++++++++++++++++++-- compiler/Makefile | 3 +- compiler/new/Makefile | 3 +- fcl/Makefile | 2 +- fcl/db/Makefile | 3 +- fcl/go32v2/Makefile | 3 +- fcl/linux/Makefile | 3 +- fcl/os2/Makefile | 3 +- fcl/shedit/gtk/Makefile | 3 +- fcl/tests/Makefile | 3 +- fcl/win32/Makefile | 3 +- ide/Makefile | 2 +- ide/fake/Makefile | 2 +- ide/fake/compiler/Makefile | 3 +- ide/fake/gdb/Makefile | 3 +- ide/text/Makefile | 3 +- install/Makefile | 12 ++-- install/demo/Makefile | 3 +- install/fpinst/Makefile | 3 +- packages/Makefile | 6 +- packages/forms/Makefile | 3 +- packages/forms/demo/Makefile | 3 +- packages/gdbint/Makefile | 3 +- packages/gdbint/libgdb/Makefile | 2 +- packages/ggi/Makefile | 3 +- packages/gtk/Makefile | 3 +- packages/gtk/examples/Makefile | 3 +- packages/gtk/tutorial/Makefile | 3 +- packages/ibase/Makefile | 3 +- packages/inet/Makefile | 3 +- packages/mysql/Makefile | 3 +- packages/ncurses/Makefile | 3 +- packages/opengl/Makefile | 2 +- packages/opengl/build/Makefile | 3 +- packages/opengl/examples/Makefile | 3 +- packages/opengl/linux/Makefile | 3 +- packages/paszlib/Makefile | 3 +- packages/postgres/Makefile | 3 +- packages/svgalib/Makefile | 3 +- packages/uncgi/Makefile | 3 +- packages/utmp/Makefile | 3 +- packages/x11/Makefile | 3 +- packages/zlib/Makefile | 3 +- rtl/Makefile | 2 +- rtl/go32v1/Makefile | 3 +- rtl/go32v2/Makefile | 3 +- rtl/linux/Makefile | 3 +- rtl/os2/Makefile | 3 +- rtl/win32/Makefile | 3 +- tests/Makefile | 2 +- utils/Makefile | 3 +- utils/fprcp/Makefile | 3 +- utils/h2pas/Makefile | 3 +- utils/simulator/Makefile | 3 +- utils/tply/Makefile | 3 +- 59 files changed, 213 insertions(+), 71 deletions(-) diff --git a/api/Makefile b/api/Makefile index 79131ee0b2..6e9cd044f8 100644 --- a/api/Makefile +++ b/api/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/16] +# Makefile generated by fpcmake v0.99.13 [2000/01/17] # defaultrule: all diff --git a/api/go32v2/Makefile b/api/go32v2/Makefile index 264386a0b2..dd93db5c78 100644 --- a/api/go32v2/Makefile +++ b/api/go32v2/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/16] +# Makefile generated by fpcmake v0.99.13 [2000/01/17] # defaultrule: all @@ -726,6 +726,7 @@ endif ifeq ($(OS_SOURCE),win32) override FPCEXTCMD:=$(FPCOPT) override FPCOPT:=!FPCEXTCMD +export FPCEXTCMD endif # Compiler commandline diff --git a/api/linux/Makefile b/api/linux/Makefile index 75a74326aa..fb99810bdf 100644 --- a/api/linux/Makefile +++ b/api/linux/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/16] +# Makefile generated by fpcmake v0.99.13 [2000/01/17] # defaultrule: all @@ -726,6 +726,7 @@ endif ifeq ($(OS_SOURCE),win32) override FPCEXTCMD:=$(FPCOPT) override FPCOPT:=!FPCEXTCMD +export FPCEXTCMD endif # Compiler commandline diff --git a/api/win32/Makefile b/api/win32/Makefile index 95588e98d7..8f909a9187 100644 --- a/api/win32/Makefile +++ b/api/win32/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/16] +# Makefile generated by fpcmake v0.99.13 [2000/01/17] # defaultrule: all @@ -726,6 +726,7 @@ endif ifeq ($(OS_SOURCE),win32) override FPCEXTCMD:=$(FPCOPT) override FPCOPT:=!FPCEXTCMD +export FPCEXTCMD endif # Compiler commandline diff --git a/base/Makefile b/base/Makefile index a8486bd6c8..dfa653c469 100644 --- a/base/Makefile +++ b/base/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/16] +# Makefile generated by fpcmake v0.99.13 [2000/01/17] # defaultrule: info @@ -292,6 +292,39 @@ else LDCONFIG= endif +# ZipProg, you can't use Zip as the var name (PFV) +ifndef ZIPPROG +ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(EXEEXT),$(SEARCHPATH)))) +ifeq ($(ZIPPROG),) +ZIPPROG= +else +ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r +endif +endif +export ZIPPROG + +ZIPOPT=-9 +ZIPEXT=.zip + +# Tar +ifndef TARPROG +TARPROG:=$(strip $(wildcard $(addsuffix /tar$(EXEEXT),$(SEARCHPATH)))) +ifeq ($(TARPROG),) +TARPROG= +else +TARPROG:=$(firstword $(TARPROG)) +endif +endif +export TARPROG + +ifeq ($(USETAR),bz2) +TAROPT=vI +TAREXT=.tar.bz2 +else +TAROPT=vz +TAREXT=.tar.gz +endif + ##################################################################### # Default extensions ##################################################################### @@ -501,13 +534,73 @@ install: $(addsuffix _install,$(DIROBJECTS)) sourceinstall: $(addsuffix _sourceinstall,$(DIROBJECTS)) +zipinstall: fpc_zipinstall + +zipsourceinstall: fpc_zipsourceinstall + clean: $(addsuffix _clean,$(DIROBJECTS)) cleanall: $(addsuffix _cleanall,$(DIROBJECTS)) require: $(addsuffix _require,$(DIROBJECTS)) -.PHONY: all debug examples test smart shared showinstall install sourceinstall clean cleanall require +.PHONY: all debug examples test smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean cleanall require + +##################################################################### +# Zip +##################################################################### + +.PHONY: fpc_zipinstall + +# Create suffix to add +ifndef PACKAGESUFFIX +PACKAGESUFFIX=$(OS_TARGET) +ifeq ($(OS_TARGET),go32v2) +PACKAGESUFFIX=go32 +endif +ifeq ($(OS_TARGET),win32) +PACKAGESUFFIX=w32 +endif +endif + +# Temporary path to pack a file +ifndef PACKDIR +ifndef inlinux +PACKDIR=$(BASEDIR)/pack_tmp +else +PACKDIR=/tmp/fpc-pack +endif +endif + +# Maybe create default zipname from packagename +ifndef ZIPNAME +ifdef PACKAGENAME +ZIPNAME=$(PACKAGEPREFIX)$(PACKAGENAME)$(PACKAGESUFFIX) +endif +endif + +# Use tar by default under linux +ifndef USEZIP +ifdef inlinux +USETAR=1 +endif +endif + +fpc_zipinstall: +ifndef ZIPNAME + @$(ECHO) "Please specify ZIPNAME!" + @exit 1 +else + $(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR) +ifdef USETAR + $(DEL) $(DESTZIPDIR)/$(ZIPNAME)$(TAREXT) + cd $(PACKDIR) ; $(TARPROG) c$(TAROPT) --file $(DESTZIPDIR)/$(ZIPNAME)$(TAREXT) * ; cd $(BASEDIR) +else + $(DEL) $(DESTZIPDIR)/$(ZIPNAME)/$(ZIPEXT) + cd $(PACKDIR) ; $(ZIPPROG) -Dr $(ZIPOPT) $(DESTZIPDIR)/$(ZIPNAME)$(ZIPEXT) * ; cd $(BASEDIR) +endif + $(DELTREE) $(PACKDIR) +endif ##################################################################### # Directories @@ -1030,19 +1123,18 @@ fvzip: rtl_clean $(MAKE) api_clean $(MAKE) fv_clean $(MAKE) fv_all - $(MAKE) api_zipinstall ZIPNAME=fv-$(PACKAGESUFFIX) - $(MAKE) fv_zipinstalladd ZIPNAME=fv-$(PACKAGESUFFIX) + $(MAKE) zipinstall ZIPTARGET='api_install fv_install' ZIPNAME=fv-$(PACKAGESUFFIX) gtkzip: rtl_clean $(MAKE) -C packages gtk_clean $(MAKE) -C packages gtk_all $(MAKE) -C packages gtk_zipinstall ZIPNAME=gtk-$(PACKAGESUFFIX) -compilerzip: compiler_clean rtl_clean +compilerzip: +# compiler_clean rtl_clean $(MAKE) rtl_all $(MAKE) compiler_all - $(MAKE) compiler_zipinstall ZIPTARGET=quickinstall ZIPNAME=compiler-$(PACKAGESUFFIX) - $(MAKE) rtl_zipinstalladd ZIPNAME=compiler-$(PACKAGESUFFIX) + $(MAKE) zipinstall ZIPTARGET='compiler_install rtl_install' ZIPNAME=compiler-$(PACKAGESUFFIX) fclzip: rtl_clean fcl_clean $(MAKE) fcl_all diff --git a/compiler/Makefile b/compiler/Makefile index 7c9f1788b8..788ea3ee84 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/16] +# Makefile generated by fpcmake v0.99.13 [2000/01/17] # defaultrule: all @@ -826,6 +826,7 @@ endif ifeq ($(OS_SOURCE),win32) override FPCEXTCMD:=$(FPCOPT) override FPCOPT:=!FPCEXTCMD +export FPCEXTCMD endif # Compiler commandline diff --git a/compiler/new/Makefile b/compiler/new/Makefile index 7a71d0f696..248a327b13 100644 --- a/compiler/new/Makefile +++ b/compiler/new/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/16] +# Makefile generated by fpcmake v0.99.13 [2000/01/17] # defaultrule: all @@ -760,6 +760,7 @@ endif ifeq ($(OS_SOURCE),win32) override FPCEXTCMD:=$(FPCOPT) override FPCOPT:=!FPCEXTCMD +export FPCEXTCMD endif # Compiler commandline diff --git a/fcl/Makefile b/fcl/Makefile index d1d791a9a3..bff106f3b1 100644 --- a/fcl/Makefile +++ b/fcl/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/16] +# Makefile generated by fpcmake v0.99.13 [2000/01/17] # defaultrule: all diff --git a/fcl/db/Makefile b/fcl/db/Makefile index 4a18748fc3..fe2a7f641b 100644 --- a/fcl/db/Makefile +++ b/fcl/db/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/16] +# Makefile generated by fpcmake v0.99.13 [2000/01/17] # defaultrule: all @@ -790,6 +790,7 @@ endif ifeq ($(OS_SOURCE),win32) override FPCEXTCMD:=$(FPCOPT) override FPCOPT:=!FPCEXTCMD +export FPCEXTCMD endif # Compiler commandline diff --git a/fcl/go32v2/Makefile b/fcl/go32v2/Makefile index 17777f107e..0868f493c2 100644 --- a/fcl/go32v2/Makefile +++ b/fcl/go32v2/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/16] +# Makefile generated by fpcmake v0.99.13 [2000/01/17] # defaultrule: all @@ -769,6 +769,7 @@ endif ifeq ($(OS_SOURCE),win32) override FPCEXTCMD:=$(FPCOPT) override FPCOPT:=!FPCEXTCMD +export FPCEXTCMD endif # Compiler commandline diff --git a/fcl/linux/Makefile b/fcl/linux/Makefile index ba2ef08f90..9b5a45271e 100644 --- a/fcl/linux/Makefile +++ b/fcl/linux/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/16] +# Makefile generated by fpcmake v0.99.13 [2000/01/17] # defaultrule: all @@ -769,6 +769,7 @@ endif ifeq ($(OS_SOURCE),win32) override FPCEXTCMD:=$(FPCOPT) override FPCOPT:=!FPCEXTCMD +export FPCEXTCMD endif # Compiler commandline diff --git a/fcl/os2/Makefile b/fcl/os2/Makefile index 009cb97691..2a7b87b5c4 100644 --- a/fcl/os2/Makefile +++ b/fcl/os2/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/16] +# Makefile generated by fpcmake v0.99.13 [2000/01/17] # defaultrule: all @@ -769,6 +769,7 @@ endif ifeq ($(OS_SOURCE),win32) override FPCEXTCMD:=$(FPCOPT) override FPCOPT:=!FPCEXTCMD +export FPCEXTCMD endif # Compiler commandline diff --git a/fcl/shedit/gtk/Makefile b/fcl/shedit/gtk/Makefile index cbb4859b77..11a98fc901 100644 --- a/fcl/shedit/gtk/Makefile +++ b/fcl/shedit/gtk/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/16] +# Makefile generated by fpcmake v0.99.13 [2000/01/17] # defaultrule: all @@ -757,6 +757,7 @@ endif ifeq ($(OS_SOURCE),win32) override FPCEXTCMD:=$(FPCOPT) override FPCOPT:=!FPCEXTCMD +export FPCEXTCMD endif # Compiler commandline diff --git a/fcl/tests/Makefile b/fcl/tests/Makefile index 74f16485ed..84cb9a4514 100644 --- a/fcl/tests/Makefile +++ b/fcl/tests/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/16] +# Makefile generated by fpcmake v0.99.13 [2000/01/17] # defaultrule: all @@ -810,6 +810,7 @@ endif ifeq ($(OS_SOURCE),win32) override FPCEXTCMD:=$(FPCOPT) override FPCOPT:=!FPCEXTCMD +export FPCEXTCMD endif # Compiler commandline diff --git a/fcl/win32/Makefile b/fcl/win32/Makefile index fdec5d8cd2..d2132cc6e1 100644 --- a/fcl/win32/Makefile +++ b/fcl/win32/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/16] +# Makefile generated by fpcmake v0.99.13 [2000/01/17] # defaultrule: all @@ -769,6 +769,7 @@ endif ifeq ($(OS_SOURCE),win32) override FPCEXTCMD:=$(FPCOPT) override FPCOPT:=!FPCEXTCMD +export FPCEXTCMD endif # Compiler commandline diff --git a/ide/Makefile b/ide/Makefile index 974f608332..7ea4d1395f 100644 --- a/ide/Makefile +++ b/ide/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/16] +# Makefile generated by fpcmake v0.99.13 [2000/01/17] # defaultrule: all diff --git a/ide/fake/Makefile b/ide/fake/Makefile index d256cdce16..1b79201d15 100644 --- a/ide/fake/Makefile +++ b/ide/fake/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/16] +# Makefile generated by fpcmake v0.99.13 [2000/01/17] # defaultrule: all diff --git a/ide/fake/compiler/Makefile b/ide/fake/compiler/Makefile index 991f90803c..b7b8109c53 100644 --- a/ide/fake/compiler/Makefile +++ b/ide/fake/compiler/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/16] +# Makefile generated by fpcmake v0.99.13 [2000/01/17] # defaultrule: all @@ -688,6 +688,7 @@ endif ifeq ($(OS_SOURCE),win32) override FPCEXTCMD:=$(FPCOPT) override FPCOPT:=!FPCEXTCMD +export FPCEXTCMD endif # Compiler commandline diff --git a/ide/fake/gdb/Makefile b/ide/fake/gdb/Makefile index e171101aba..4b5c767ad4 100644 --- a/ide/fake/gdb/Makefile +++ b/ide/fake/gdb/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/16] +# Makefile generated by fpcmake v0.99.13 [2000/01/17] # defaultrule: all @@ -688,6 +688,7 @@ endif ifeq ($(OS_SOURCE),win32) override FPCEXTCMD:=$(FPCOPT) override FPCOPT:=!FPCEXTCMD +export FPCEXTCMD endif # Compiler commandline diff --git a/ide/text/Makefile b/ide/text/Makefile index 1678039978..e1d82668ba 100644 --- a/ide/text/Makefile +++ b/ide/text/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/16] +# Makefile generated by fpcmake v0.99.13 [2000/01/17] # defaultrule: all @@ -852,6 +852,7 @@ endif ifeq ($(OS_SOURCE),win32) override FPCEXTCMD:=$(FPCOPT) override FPCOPT:=!FPCEXTCMD +export FPCEXTCMD endif # Compiler commandline diff --git a/install/Makefile b/install/Makefile index 90d9f44785..3279217a26 100644 --- a/install/Makefile +++ b/install/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/16] +# Makefile generated by fpcmake v0.99.13 [2000/01/17] # defaultrule: help @@ -693,6 +693,7 @@ endif ifeq ($(OS_SOURCE),win32) override FPCEXTCMD:=$(FPCOPT) override FPCOPT:=!FPCEXTCMD +export FPCEXTCMD endif # Compiler commandline @@ -980,6 +981,9 @@ endif # Users rules ##################################################################### +# These values can change +unexport FPC_VERSION OS_SOURCE + .PHONY: help checkfpcdir help: @@ -1029,7 +1033,7 @@ clean: build: build-stamp build-stamp: $(FPCDIRSET) # create new compiler - -$(MAKE) -C $(CVSBASE) compiler_cycle + $(MAKE) -C $(CVSBASE) compiler_cycle # clean $(MAKE) -C $(CVSBASE) rtl_clean $(MAKE) -C $(CVSBASE) api_clean @@ -1128,8 +1132,8 @@ source: $(MAKE) -C $(CVSBASE) fcl_zipsourceinstall $(MAKE) -C $(CVSBASE) packages_zipsourceinstall $(MAKE) -C $(CVSBASE) utils_zipsourceinstall - $(MAKE) installersrc - $(MAKE) docsrc +# $(MAKE) installersrc +# $(MAKE) docsrc ########################################################################## diff --git a/install/demo/Makefile b/install/demo/Makefile index 8824f30db2..d0045ae6fc 100644 --- a/install/demo/Makefile +++ b/install/demo/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/16] +# Makefile generated by fpcmake v0.99.13 [2000/01/17] # defaultrule: both @@ -754,6 +754,7 @@ endif ifeq ($(OS_SOURCE),win32) override FPCEXTCMD:=$(FPCOPT) override FPCOPT:=!FPCEXTCMD +export FPCEXTCMD endif # Compiler commandline diff --git a/install/fpinst/Makefile b/install/fpinst/Makefile index ee925c61f4..19c6de15cd 100644 --- a/install/fpinst/Makefile +++ b/install/fpinst/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/16] +# Makefile generated by fpcmake v0.99.13 [2000/01/17] # defaultrule: all @@ -769,6 +769,7 @@ endif ifeq ($(OS_SOURCE),win32) override FPCEXTCMD:=$(FPCOPT) override FPCOPT:=!FPCEXTCMD +export FPCEXTCMD endif # Compiler commandline diff --git a/packages/Makefile b/packages/Makefile index 132b493d9a..ee2b6dd29f 100644 --- a/packages/Makefile +++ b/packages/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/16] +# Makefile generated by fpcmake v0.99.13 [2000/01/17] # defaultrule: all @@ -149,7 +149,7 @@ ifeq ($(OS_TARGET),go32v2) override DIROBJECTS+=$(wildcard uncgi gdbint paszlib) endif ifeq ($(OS_TARGET),win32) -override DIROBJECTS+=$(wildcard uncgi gtk opengl gdbint ibase mysql zlib paszlib) +override DIROBJECTS+=$(wildcard uncgi gtk gdbint ibase mysql zlib paszlib) endif # Clean @@ -341,7 +341,6 @@ PKGBASE=paszlib PKGGTK=gtk PKGNET=uncgi PKGDB=ibase mysql -PKGGFX=opengl PKGMISC=gdbint endif @@ -853,7 +852,6 @@ endif ifeq ($(OS_TARGET),win32) OBJECTDIRUNCGI=1 OBJECTDIRGTK=1 -OBJECTDIROPENGL=1 OBJECTDIRGDBINT=1 OBJECTDIRIBASE=1 OBJECTDIRMYSQL=1 diff --git a/packages/forms/Makefile b/packages/forms/Makefile index 217478659e..607a601359 100644 --- a/packages/forms/Makefile +++ b/packages/forms/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/16] +# Makefile generated by fpcmake v0.99.13 [2000/01/17] # defaultrule: all @@ -727,6 +727,7 @@ endif ifeq ($(OS_SOURCE),win32) override FPCEXTCMD:=$(FPCOPT) override FPCOPT:=!FPCEXTCMD +export FPCEXTCMD endif # Compiler commandline diff --git a/packages/forms/demo/Makefile b/packages/forms/demo/Makefile index cc5c7a8274..455dc0427f 100644 --- a/packages/forms/demo/Makefile +++ b/packages/forms/demo/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/16] +# Makefile generated by fpcmake v0.99.13 [2000/01/17] # defaultrule: all @@ -770,6 +770,7 @@ endif ifeq ($(OS_SOURCE),win32) override FPCEXTCMD:=$(FPCOPT) override FPCOPT:=!FPCEXTCMD +export FPCEXTCMD endif # Compiler commandline diff --git a/packages/gdbint/Makefile b/packages/gdbint/Makefile index 3109259d7c..a1af27a972 100644 --- a/packages/gdbint/Makefile +++ b/packages/gdbint/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/16] +# Makefile generated by fpcmake v0.99.13 [2000/01/17] # defaultrule: all @@ -729,6 +729,7 @@ endif ifeq ($(OS_SOURCE),win32) override FPCEXTCMD:=$(FPCOPT) override FPCOPT:=!FPCEXTCMD +export FPCEXTCMD endif # Compiler commandline diff --git a/packages/gdbint/libgdb/Makefile b/packages/gdbint/libgdb/Makefile index 48acd50b8d..dc134c5095 100644 --- a/packages/gdbint/libgdb/Makefile +++ b/packages/gdbint/libgdb/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/16] +# Makefile generated by fpcmake v0.99.13 [2000/01/17] # defaultrule: all diff --git a/packages/ggi/Makefile b/packages/ggi/Makefile index 242f13f93f..b4d11e7e82 100644 --- a/packages/ggi/Makefile +++ b/packages/ggi/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/16] +# Makefile generated by fpcmake v0.99.13 [2000/01/17] # defaultrule: all @@ -697,6 +697,7 @@ endif ifeq ($(OS_SOURCE),win32) override FPCEXTCMD:=$(FPCOPT) override FPCOPT:=!FPCEXTCMD +export FPCEXTCMD endif # Compiler commandline diff --git a/packages/gtk/Makefile b/packages/gtk/Makefile index f1f71ad08c..7d1b14af1a 100644 --- a/packages/gtk/Makefile +++ b/packages/gtk/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/16] +# Makefile generated by fpcmake v0.99.13 [2000/01/17] # defaultrule: all @@ -706,6 +706,7 @@ endif ifeq ($(OS_SOURCE),win32) override FPCEXTCMD:=$(FPCOPT) override FPCOPT:=!FPCEXTCMD +export FPCEXTCMD endif # Compiler commandline diff --git a/packages/gtk/examples/Makefile b/packages/gtk/examples/Makefile index a9d6c5de3e..3e35d90809 100644 --- a/packages/gtk/examples/Makefile +++ b/packages/gtk/examples/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/16] +# Makefile generated by fpcmake v0.99.13 [2000/01/17] # defaultrule: all @@ -734,6 +734,7 @@ endif ifeq ($(OS_SOURCE),win32) override FPCEXTCMD:=$(FPCOPT) override FPCOPT:=!FPCEXTCMD +export FPCEXTCMD endif # Compiler commandline diff --git a/packages/gtk/tutorial/Makefile b/packages/gtk/tutorial/Makefile index 01a55375ad..1b332824f5 100644 --- a/packages/gtk/tutorial/Makefile +++ b/packages/gtk/tutorial/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/16] +# Makefile generated by fpcmake v0.99.13 [2000/01/17] # defaultrule: all @@ -733,6 +733,7 @@ endif ifeq ($(OS_SOURCE),win32) override FPCEXTCMD:=$(FPCOPT) override FPCOPT:=!FPCEXTCMD +export FPCEXTCMD endif # Compiler commandline diff --git a/packages/ibase/Makefile b/packages/ibase/Makefile index c146034e8f..fcbd95f326 100644 --- a/packages/ibase/Makefile +++ b/packages/ibase/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/16] +# Makefile generated by fpcmake v0.99.13 [2000/01/17] # defaultrule: all @@ -697,6 +697,7 @@ endif ifeq ($(OS_SOURCE),win32) override FPCEXTCMD:=$(FPCOPT) override FPCOPT:=!FPCEXTCMD +export FPCEXTCMD endif # Compiler commandline diff --git a/packages/inet/Makefile b/packages/inet/Makefile index ce8955dec8..43160aed6a 100644 --- a/packages/inet/Makefile +++ b/packages/inet/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/16] +# Makefile generated by fpcmake v0.99.13 [2000/01/17] # defaultrule: all @@ -697,6 +697,7 @@ endif ifeq ($(OS_SOURCE),win32) override FPCEXTCMD:=$(FPCOPT) override FPCOPT:=!FPCEXTCMD +export FPCEXTCMD endif # Compiler commandline diff --git a/packages/mysql/Makefile b/packages/mysql/Makefile index 90f8c0e2bf..a7600f1453 100644 --- a/packages/mysql/Makefile +++ b/packages/mysql/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/16] +# Makefile generated by fpcmake v0.99.13 [2000/01/17] # defaultrule: all @@ -697,6 +697,7 @@ endif ifeq ($(OS_SOURCE),win32) override FPCEXTCMD:=$(FPCOPT) override FPCOPT:=!FPCEXTCMD +export FPCEXTCMD endif # Compiler commandline diff --git a/packages/ncurses/Makefile b/packages/ncurses/Makefile index 939c270297..e52a4dd54b 100644 --- a/packages/ncurses/Makefile +++ b/packages/ncurses/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/16] +# Makefile generated by fpcmake v0.99.13 [2000/01/17] # defaultrule: all @@ -697,6 +697,7 @@ endif ifeq ($(OS_SOURCE),win32) override FPCEXTCMD:=$(FPCOPT) override FPCOPT:=!FPCEXTCMD +export FPCEXTCMD endif # Compiler commandline diff --git a/packages/opengl/Makefile b/packages/opengl/Makefile index 0420f44b92..9b66c5b743 100644 --- a/packages/opengl/Makefile +++ b/packages/opengl/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/16] +# Makefile generated by fpcmake v0.99.13 [2000/01/17] # defaultrule: all diff --git a/packages/opengl/build/Makefile b/packages/opengl/build/Makefile index 6cdbf78b19..61135c219a 100644 --- a/packages/opengl/build/Makefile +++ b/packages/opengl/build/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/16] +# Makefile generated by fpcmake v0.99.13 [2000/01/17] # defaultrule: all @@ -727,6 +727,7 @@ endif ifeq ($(OS_SOURCE),win32) override FPCEXTCMD:=$(FPCOPT) override FPCOPT:=!FPCEXTCMD +export FPCEXTCMD endif # Compiler commandline diff --git a/packages/opengl/examples/Makefile b/packages/opengl/examples/Makefile index 8e5820991c..cb7938e480 100644 --- a/packages/opengl/examples/Makefile +++ b/packages/opengl/examples/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/16] +# Makefile generated by fpcmake v0.99.13 [2000/01/17] # defaultrule: all @@ -770,6 +770,7 @@ endif ifeq ($(OS_SOURCE),win32) override FPCEXTCMD:=$(FPCOPT) override FPCOPT:=!FPCEXTCMD +export FPCEXTCMD endif # Compiler commandline diff --git a/packages/opengl/linux/Makefile b/packages/opengl/linux/Makefile index ab58789577..3be8473c9c 100644 --- a/packages/opengl/linux/Makefile +++ b/packages/opengl/linux/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/16] +# Makefile generated by fpcmake v0.99.13 [2000/01/17] # defaultrule: all @@ -732,6 +732,7 @@ endif ifeq ($(OS_SOURCE),win32) override FPCEXTCMD:=$(FPCOPT) override FPCOPT:=!FPCEXTCMD +export FPCEXTCMD endif # Compiler commandline diff --git a/packages/paszlib/Makefile b/packages/paszlib/Makefile index 8d78f7529b..904925748b 100644 --- a/packages/paszlib/Makefile +++ b/packages/paszlib/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/16] +# Makefile generated by fpcmake v0.99.13 [2000/01/17] # defaultrule: all @@ -698,6 +698,7 @@ endif ifeq ($(OS_SOURCE),win32) override FPCEXTCMD:=$(FPCOPT) override FPCOPT:=!FPCEXTCMD +export FPCEXTCMD endif # Compiler commandline diff --git a/packages/postgres/Makefile b/packages/postgres/Makefile index 65d7c3f485..9d5c61ceed 100644 --- a/packages/postgres/Makefile +++ b/packages/postgres/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/16] +# Makefile generated by fpcmake v0.99.13 [2000/01/17] # defaultrule: all @@ -697,6 +697,7 @@ endif ifeq ($(OS_SOURCE),win32) override FPCEXTCMD:=$(FPCOPT) override FPCOPT:=!FPCEXTCMD +export FPCEXTCMD endif # Compiler commandline diff --git a/packages/svgalib/Makefile b/packages/svgalib/Makefile index ad3259d9cd..a609facea4 100644 --- a/packages/svgalib/Makefile +++ b/packages/svgalib/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/16] +# Makefile generated by fpcmake v0.99.13 [2000/01/17] # defaultrule: all @@ -697,6 +697,7 @@ endif ifeq ($(OS_SOURCE),win32) override FPCEXTCMD:=$(FPCOPT) override FPCOPT:=!FPCEXTCMD +export FPCEXTCMD endif # Compiler commandline diff --git a/packages/uncgi/Makefile b/packages/uncgi/Makefile index f6b83e22ca..581582a3da 100644 --- a/packages/uncgi/Makefile +++ b/packages/uncgi/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/16] +# Makefile generated by fpcmake v0.99.13 [2000/01/17] # defaultrule: all @@ -697,6 +697,7 @@ endif ifeq ($(OS_SOURCE),win32) override FPCEXTCMD:=$(FPCOPT) override FPCOPT:=!FPCEXTCMD +export FPCEXTCMD endif # Compiler commandline diff --git a/packages/utmp/Makefile b/packages/utmp/Makefile index 3f37420ffd..13b1d46318 100644 --- a/packages/utmp/Makefile +++ b/packages/utmp/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/16] +# Makefile generated by fpcmake v0.99.13 [2000/01/17] # defaultrule: all @@ -697,6 +697,7 @@ endif ifeq ($(OS_SOURCE),win32) override FPCEXTCMD:=$(FPCOPT) override FPCOPT:=!FPCEXTCMD +export FPCEXTCMD endif # Compiler commandline diff --git a/packages/x11/Makefile b/packages/x11/Makefile index bfb6ce0f92..9128475251 100644 --- a/packages/x11/Makefile +++ b/packages/x11/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/16] +# Makefile generated by fpcmake v0.99.13 [2000/01/17] # defaultrule: all @@ -696,6 +696,7 @@ endif ifeq ($(OS_SOURCE),win32) override FPCEXTCMD:=$(FPCOPT) override FPCOPT:=!FPCEXTCMD +export FPCEXTCMD endif # Compiler commandline diff --git a/packages/zlib/Makefile b/packages/zlib/Makefile index d5ba23bd20..9db2f5d7bf 100644 --- a/packages/zlib/Makefile +++ b/packages/zlib/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/16] +# Makefile generated by fpcmake v0.99.13 [2000/01/17] # defaultrule: all @@ -696,6 +696,7 @@ endif ifeq ($(OS_SOURCE),win32) override FPCEXTCMD:=$(FPCOPT) override FPCOPT:=!FPCEXTCMD +export FPCEXTCMD endif # Compiler commandline diff --git a/rtl/Makefile b/rtl/Makefile index c9c62600cf..4514a02b18 100644 --- a/rtl/Makefile +++ b/rtl/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/16] +# Makefile generated by fpcmake v0.99.13 [2000/01/17] # defaultrule: all diff --git a/rtl/go32v1/Makefile b/rtl/go32v1/Makefile index 76fb3eec36..a6a86101df 100644 --- a/rtl/go32v1/Makefile +++ b/rtl/go32v1/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/16] +# Makefile generated by fpcmake v0.99.13 [2000/01/17] # defaultrule: all @@ -687,6 +687,7 @@ endif ifeq ($(OS_SOURCE),win32) override FPCEXTCMD:=$(FPCOPT) override FPCOPT:=!FPCEXTCMD +export FPCEXTCMD endif # Compiler commandline diff --git a/rtl/go32v2/Makefile b/rtl/go32v2/Makefile index a8fc110ed1..09539c7f41 100644 --- a/rtl/go32v2/Makefile +++ b/rtl/go32v2/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/16] +# Makefile generated by fpcmake v0.99.13 [2000/01/17] # defaultrule: all @@ -687,6 +687,7 @@ endif ifeq ($(OS_SOURCE),win32) override FPCEXTCMD:=$(FPCOPT) override FPCOPT:=!FPCEXTCMD +export FPCEXTCMD endif # Compiler commandline diff --git a/rtl/linux/Makefile b/rtl/linux/Makefile index e1d916059f..673e30f9c3 100644 --- a/rtl/linux/Makefile +++ b/rtl/linux/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/16] +# Makefile generated by fpcmake v0.99.13 [2000/01/17] # defaultrule: all @@ -698,6 +698,7 @@ endif ifeq ($(OS_SOURCE),win32) override FPCEXTCMD:=$(FPCOPT) override FPCOPT:=!FPCEXTCMD +export FPCEXTCMD endif # Compiler commandline diff --git a/rtl/os2/Makefile b/rtl/os2/Makefile index d3960e75e7..03beaea3d5 100644 --- a/rtl/os2/Makefile +++ b/rtl/os2/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/16] +# Makefile generated by fpcmake v0.99.13 [2000/01/17] # defaultrule: all @@ -687,6 +687,7 @@ endif ifeq ($(OS_SOURCE),win32) override FPCEXTCMD:=$(FPCOPT) override FPCOPT:=!FPCEXTCMD +export FPCEXTCMD endif # Compiler commandline diff --git a/rtl/win32/Makefile b/rtl/win32/Makefile index 5bf6675b7e..4da1c96956 100644 --- a/rtl/win32/Makefile +++ b/rtl/win32/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/16] +# Makefile generated by fpcmake v0.99.13 [2000/01/17] # defaultrule: all @@ -692,6 +692,7 @@ endif ifeq ($(OS_SOURCE),win32) override FPCEXTCMD:=$(FPCOPT) override FPCOPT:=!FPCEXTCMD +export FPCEXTCMD endif # Compiler commandline diff --git a/tests/Makefile b/tests/Makefile index 4248ff7073..bc4240a696 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/16] +# Makefile generated by fpcmake v0.99.13 [2000/01/17] # defaultrule: info diff --git a/utils/Makefile b/utils/Makefile index a6be234921..55f4a252b4 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/16] +# Makefile generated by fpcmake v0.99.13 [2000/01/17] # defaultrule: all @@ -830,6 +830,7 @@ endif ifeq ($(OS_SOURCE),win32) override FPCEXTCMD:=$(FPCOPT) override FPCOPT:=!FPCEXTCMD +export FPCEXTCMD endif # Compiler commandline diff --git a/utils/fprcp/Makefile b/utils/fprcp/Makefile index dfee4c71ff..9e8c02504e 100644 --- a/utils/fprcp/Makefile +++ b/utils/fprcp/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/16] +# Makefile generated by fpcmake v0.99.13 [2000/01/17] # defaultrule: all @@ -697,6 +697,7 @@ endif ifeq ($(OS_SOURCE),win32) override FPCEXTCMD:=$(FPCOPT) override FPCOPT:=!FPCEXTCMD +export FPCEXTCMD endif # Compiler commandline diff --git a/utils/h2pas/Makefile b/utils/h2pas/Makefile index 71bc09bad7..412e5163f1 100644 --- a/utils/h2pas/Makefile +++ b/utils/h2pas/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/16] +# Makefile generated by fpcmake v0.99.13 [2000/01/17] # defaultrule: all @@ -702,6 +702,7 @@ endif ifeq ($(OS_SOURCE),win32) override FPCEXTCMD:=$(FPCOPT) override FPCOPT:=!FPCEXTCMD +export FPCEXTCMD endif # Compiler commandline diff --git a/utils/simulator/Makefile b/utils/simulator/Makefile index b4f011c7b7..205fe1498e 100644 --- a/utils/simulator/Makefile +++ b/utils/simulator/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/16] +# Makefile generated by fpcmake v0.99.13 [2000/01/17] # defaultrule: all @@ -697,6 +697,7 @@ endif ifeq ($(OS_SOURCE),win32) override FPCEXTCMD:=$(FPCOPT) override FPCOPT:=!FPCEXTCMD +export FPCEXTCMD endif # Compiler commandline diff --git a/utils/tply/Makefile b/utils/tply/Makefile index 69e93d1573..fb80f96807 100644 --- a/utils/tply/Makefile +++ b/utils/tply/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/16] +# Makefile generated by fpcmake v0.99.13 [2000/01/17] # defaultrule: all @@ -714,6 +714,7 @@ endif ifeq ($(OS_SOURCE),win32) override FPCEXTCMD:=$(FPCOPT) override FPCOPT:=!FPCEXTCMD +export FPCEXTCMD endif # Compiler commandline