* yet another fix for GO32v2 building

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@9225 3ad0048d-3df7-0310-abae-a5850022a9f2

2 files changed, 67 insertions, 59 deletions

diff --git a/packages/fcl-net/Makefile b/packages/fcl-net/Makefile
index 5e751b6478..b734a69083 100644
--- a/packages/fcl-net/Makefile
+++ b/packages/fcl-net/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/11/08]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/11/11]
 #
 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-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded
@@ -309,163 +309,163 @@ ifeq ($(FULL_TARGET),powerpc64-darwin)
 override TARGET_PROGRAMS+=mkxmlrpc
 endif
 ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_UNITS+=servlets resolve ssockets  fpsock httpbase httpclient httpsvlt xmlrpc
+override TARGET_UNITS+=servlets  resolve ssockets fpsock httpbase httpclient httpsvlt xmlrpc
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_UNITS+=servlets resolve ssockets
+override TARGET_UNITS+=servlets
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_UNITS+=servlets resolve ssockets
+override TARGET_UNITS+=servlets  resolve ssockets
 endif
 ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_UNITS+=servlets resolve ssockets
+override TARGET_UNITS+=servlets
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_UNITS+=servlets resolve ssockets  fpsock httpbase httpclient httpsvlt xmlrpc
+override TARGET_UNITS+=servlets  resolve ssockets fpsock httpbase httpclient httpsvlt xmlrpc
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_UNITS+=servlets resolve ssockets
+override TARGET_UNITS+=servlets  resolve ssockets
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_UNITS+=servlets resolve ssockets  fpsock httpbase httpclient httpsvlt xmlrpc
+override TARGET_UNITS+=servlets  resolve ssockets fpsock httpbase httpclient httpsvlt xmlrpc
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_UNITS+=servlets resolve ssockets
+override TARGET_UNITS+=servlets  resolve ssockets
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_UNITS+=servlets resolve ssockets
+override TARGET_UNITS+=servlets  resolve ssockets
 endif
 ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_UNITS+=servlets resolve ssockets
+override TARGET_UNITS+=servlets
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_UNITS+=servlets resolve ssockets  fpsock httpbase httpclient httpsvlt xmlrpc
+override TARGET_UNITS+=servlets  resolve ssockets fpsock httpbase httpclient httpsvlt xmlrpc
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_UNITS+=servlets resolve ssockets
+override TARGET_UNITS+=servlets
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_UNITS+=servlets resolve ssockets
+override TARGET_UNITS+=servlets  resolve ssockets
 endif
 ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_UNITS+=servlets resolve ssockets
+override TARGET_UNITS+=servlets  resolve ssockets
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_UNITS+=servlets resolve ssockets
+override TARGET_UNITS+=servlets
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_UNITS+=servlets resolve ssockets
+override TARGET_UNITS+=servlets
 endif
 ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_UNITS+=servlets resolve ssockets
+override TARGET_UNITS+=servlets  resolve ssockets
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_UNITS+=servlets resolve ssockets
+override TARGET_UNITS+=servlets
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_UNITS+=servlets resolve ssockets
+override TARGET_UNITS+=servlets
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_UNITS+=servlets resolve ssockets  fpsock httpbase httpclient httpsvlt xmlrpc
+override TARGET_UNITS+=servlets  resolve ssockets fpsock httpbase httpclient httpsvlt xmlrpc
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_UNITS+=servlets resolve ssockets  fpsock httpbase httpclient httpsvlt xmlrpc
+override TARGET_UNITS+=servlets  resolve ssockets fpsock httpbase httpclient httpsvlt xmlrpc
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_UNITS+=servlets resolve ssockets  fpsock httpbase httpclient httpsvlt xmlrpc
+override TARGET_UNITS+=servlets  resolve ssockets fpsock httpbase httpclient httpsvlt xmlrpc
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_UNITS+=servlets resolve ssockets
+override TARGET_UNITS+=servlets
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_UNITS+=servlets resolve ssockets
+override TARGET_UNITS+=servlets
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_UNITS+=servlets resolve ssockets  fpsock httpbase httpclient httpsvlt xmlrpc
+override TARGET_UNITS+=servlets  resolve ssockets fpsock httpbase httpclient httpsvlt xmlrpc
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_UNITS+=servlets resolve ssockets
+override TARGET_UNITS+=servlets
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_UNITS+=servlets resolve ssockets
+override TARGET_UNITS+=servlets
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_UNITS+=servlets resolve ssockets  fpsock httpbase httpclient httpsvlt xmlrpc
+override TARGET_UNITS+=servlets  resolve ssockets fpsock httpbase httpclient httpsvlt xmlrpc
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_UNITS+=servlets resolve ssockets  fpsock httpbase httpclient httpsvlt xmlrpc
+override TARGET_UNITS+=servlets  resolve ssockets fpsock httpbase httpclient httpsvlt xmlrpc
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_UNITS+=servlets resolve ssockets
+override TARGET_UNITS+=servlets
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_UNITS+=servlets resolve ssockets
+override TARGET_UNITS+=servlets
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_UNITS+=servlets resolve ssockets
+override TARGET_UNITS+=servlets  resolve ssockets
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_UNITS+=servlets resolve ssockets
+override TARGET_UNITS+=servlets
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_UNITS+=servlets resolve ssockets
+override TARGET_UNITS+=servlets
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_UNITS+=servlets resolve ssockets  fpsock httpbase httpclient httpsvlt xmlrpc
+override TARGET_UNITS+=servlets  resolve ssockets fpsock httpbase httpclient httpsvlt xmlrpc
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_UNITS+=servlets resolve ssockets  fpsock httpbase httpclient httpsvlt xmlrpc
+override TARGET_UNITS+=servlets  resolve ssockets fpsock httpbase httpclient httpsvlt xmlrpc
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_UNITS+=servlets resolve ssockets
+override TARGET_UNITS+=servlets  resolve ssockets
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_UNITS+=servlets resolve ssockets
+override TARGET_UNITS+=servlets
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_UNITS+=servlets resolve ssockets  fpsock httpbase httpclient httpsvlt xmlrpc
+override TARGET_UNITS+=servlets  resolve ssockets fpsock httpbase httpclient httpsvlt xmlrpc
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_UNITS+=servlets resolve ssockets  fpsock httpbase httpclient httpsvlt xmlrpc
+override TARGET_UNITS+=servlets  resolve ssockets fpsock httpbase httpclient httpsvlt xmlrpc
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_UNITS+=servlets resolve ssockets
+override TARGET_UNITS+=servlets  resolve ssockets
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_UNITS+=servlets resolve ssockets
+override TARGET_UNITS+=servlets  resolve ssockets
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_UNITS+=servlets resolve ssockets
+override TARGET_UNITS+=servlets
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_UNITS+=servlets resolve ssockets  fpsock httpbase httpclient httpsvlt xmlrpc
+override TARGET_UNITS+=servlets  resolve ssockets fpsock httpbase httpclient httpsvlt xmlrpc
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_UNITS+=servlets resolve ssockets
+override TARGET_UNITS+=servlets
 endif
 ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_UNITS+=servlets resolve ssockets
+override TARGET_UNITS+=servlets  resolve ssockets
 endif
 ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_UNITS+=servlets resolve ssockets
+override TARGET_UNITS+=servlets
 endif
 ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_UNITS+=servlets resolve ssockets
+override TARGET_UNITS+=servlets
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_UNITS+=servlets resolve ssockets
+override TARGET_UNITS+=servlets
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_UNITS+=servlets resolve ssockets
+override TARGET_UNITS+=servlets
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_UNITS+=servlets resolve ssockets  fpsock httpbase httpclient httpsvlt xmlrpc
+override TARGET_UNITS+=servlets  resolve ssockets fpsock httpbase httpclient httpsvlt xmlrpc
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_UNITS+=servlets resolve ssockets
+override TARGET_UNITS+=servlets  resolve ssockets
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_UNITS+=servlets resolve ssockets
+override TARGET_UNITS+=servlets
 endif
 ifeq ($(FULL_TARGET),i386-linux)
 override TARGET_RSTS+=fpsock httpsvlt mkxmlrpc
diff --git a/packages/fcl-net/Makefile.fpc b/packages/fcl-net/Makefile.fpc
index 1cdab4239d..bd251fe06a 100644
--- a/packages/fcl-net/Makefile.fpc
+++ b/packages/fcl-net/Makefile.fpc
@@ -7,11 +7,19 @@ name=fcl-net
 version=2.0.0
 
 [target]
-units=servlets resolve ssockets
-units_linux=fpsock httpbase httpclient httpsvlt xmlrpc
-units_freebsd=fpsock httpbase httpclient httpsvlt xmlrpc
-units_netbsd=fpsock httpbase httpclient httpsvlt xmlrpc
-units_openbsd=fpsock httpbase httpclient httpsvlt xmlrpc
+units=servlets
+units_linux=resolve ssockets fpsock httpbase httpclient httpsvlt xmlrpc
+units_freebsd=resolve ssockets fpsock httpbase httpclient httpsvlt xmlrpc
+units_netbsd=resolve ssockets fpsock httpbase httpclient httpsvlt xmlrpc
+units_openbsd=resolve ssockets fpsock httpbase httpclient httpsvlt xmlrpc
+units_darwin=resolve ssockets 
+units_solaris=resolve ssockets 
+units_qnx=resolve ssockets 
+units_beos=resolve ssockets 
+units_emx=resolve ssockets 
+units_win32=resolve ssockets 
+units_win64=resolve ssockets 
+units_wince=resolve ssockets 
 programs_linux=mkxmlrpc
 programs_freebsd=mkxmlrpc
 programs_darwin=mkxmlrpc