From ad1c9bf4e610b77d0b3b2b79d434a6650b29ee56 Mon Sep 17 00:00:00 2001 From: peter Date: Mon, 29 Oct 2007 16:07:13 +0000 Subject: [PATCH] * fixed includedirs git-svn-id: trunk@8989 - --- packages/fcl-net/Makefile | 262 +++++++++++++++++++++++++++------- packages/fcl-net/Makefile.fpc | 15 +- 2 files changed, 223 insertions(+), 54 deletions(-) diff --git a/packages/fcl-net/Makefile b/packages/fcl-net/Makefile index 2fe235a40f..a9c558516a 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/10/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/10/25] # 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded @@ -672,160 +672,316 @@ ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_OPTIONS+=-S2h endif ifeq ($(FULL_TARGET),i386-linux) -override COMPILER_SOURCEDIR+=src +override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/unix endif ifeq ($(FULL_TARGET),i386-go32v2) -override COMPILER_SOURCEDIR+=src +override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) endif ifeq ($(FULL_TARGET),i386-win32) -override COMPILER_SOURCEDIR+=src +override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/win endif ifeq ($(FULL_TARGET),i386-os2) -override COMPILER_SOURCEDIR+=src +override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) endif ifeq ($(FULL_TARGET),i386-freebsd) -override COMPILER_SOURCEDIR+=src +override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/unix endif ifeq ($(FULL_TARGET),i386-beos) -override COMPILER_SOURCEDIR+=src +override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/unix endif ifeq ($(FULL_TARGET),i386-netbsd) -override COMPILER_SOURCEDIR+=src +override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/unix endif ifeq ($(FULL_TARGET),i386-solaris) -override COMPILER_SOURCEDIR+=src +override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/unix endif ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_SOURCEDIR+=src +override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/unix endif ifeq ($(FULL_TARGET),i386-netware) -override COMPILER_SOURCEDIR+=src +override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) endif ifeq ($(FULL_TARGET),i386-openbsd) -override COMPILER_SOURCEDIR+=src +override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/unix endif ifeq ($(FULL_TARGET),i386-wdosx) -override COMPILER_SOURCEDIR+=src +override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) endif ifeq ($(FULL_TARGET),i386-darwin) -override COMPILER_SOURCEDIR+=src +override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/unix endif ifeq ($(FULL_TARGET),i386-emx) -override COMPILER_SOURCEDIR+=src +override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/os2 endif ifeq ($(FULL_TARGET),i386-watcom) -override COMPILER_SOURCEDIR+=src +override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) endif ifeq ($(FULL_TARGET),i386-netwlibc) -override COMPILER_SOURCEDIR+=src +override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) endif ifeq ($(FULL_TARGET),i386-wince) -override COMPILER_SOURCEDIR+=src +override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/win endif ifeq ($(FULL_TARGET),i386-embedded) -override COMPILER_SOURCEDIR+=src +override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) endif ifeq ($(FULL_TARGET),i386-symbian) -override COMPILER_SOURCEDIR+=src +override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) endif ifeq ($(FULL_TARGET),m68k-linux) -override COMPILER_SOURCEDIR+=src +override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/unix endif ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_SOURCEDIR+=src +override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/unix endif ifeq ($(FULL_TARGET),m68k-netbsd) -override COMPILER_SOURCEDIR+=src +override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/unix endif ifeq ($(FULL_TARGET),m68k-amiga) -override COMPILER_SOURCEDIR+=src +override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) endif ifeq ($(FULL_TARGET),m68k-atari) -override COMPILER_SOURCEDIR+=src +override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) endif ifeq ($(FULL_TARGET),m68k-openbsd) -override COMPILER_SOURCEDIR+=src +override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/unix endif ifeq ($(FULL_TARGET),m68k-palmos) -override COMPILER_SOURCEDIR+=src +override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) endif ifeq ($(FULL_TARGET),m68k-embedded) -override COMPILER_SOURCEDIR+=src +override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) endif ifeq ($(FULL_TARGET),powerpc-linux) -override COMPILER_SOURCEDIR+=src +override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/unix endif ifeq ($(FULL_TARGET),powerpc-netbsd) -override COMPILER_SOURCEDIR+=src +override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/unix endif ifeq ($(FULL_TARGET),powerpc-amiga) -override COMPILER_SOURCEDIR+=src +override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) endif ifeq ($(FULL_TARGET),powerpc-macos) -override COMPILER_SOURCEDIR+=src +override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) endif ifeq ($(FULL_TARGET),powerpc-darwin) -override COMPILER_SOURCEDIR+=src +override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/unix endif ifeq ($(FULL_TARGET),powerpc-morphos) -override COMPILER_SOURCEDIR+=src +override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) endif ifeq ($(FULL_TARGET),powerpc-embedded) -override COMPILER_SOURCEDIR+=src +override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) endif ifeq ($(FULL_TARGET),sparc-linux) -override COMPILER_SOURCEDIR+=src +override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/unix endif ifeq ($(FULL_TARGET),sparc-netbsd) -override COMPILER_SOURCEDIR+=src +override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/unix endif ifeq ($(FULL_TARGET),sparc-solaris) -override COMPILER_SOURCEDIR+=src +override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/unix endif ifeq ($(FULL_TARGET),sparc-embedded) -override COMPILER_SOURCEDIR+=src +override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) endif ifeq ($(FULL_TARGET),x86_64-linux) -override COMPILER_SOURCEDIR+=src +override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/unix endif ifeq ($(FULL_TARGET),x86_64-freebsd) -override COMPILER_SOURCEDIR+=src +override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/unix endif ifeq ($(FULL_TARGET),x86_64-win64) -override COMPILER_SOURCEDIR+=src +override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/win endif ifeq ($(FULL_TARGET),x86_64-embedded) -override COMPILER_SOURCEDIR+=src +override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) endif ifeq ($(FULL_TARGET),arm-linux) -override COMPILER_SOURCEDIR+=src +override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/unix endif ifeq ($(FULL_TARGET),arm-palmos) -override COMPILER_SOURCEDIR+=src +override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) endif ifeq ($(FULL_TARGET),arm-wince) -override COMPILER_SOURCEDIR+=src +override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/win endif ifeq ($(FULL_TARGET),arm-gba) -override COMPILER_SOURCEDIR+=src +override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) endif ifeq ($(FULL_TARGET),arm-nds) -override COMPILER_SOURCEDIR+=src +override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) endif ifeq ($(FULL_TARGET),arm-embedded) -override COMPILER_SOURCEDIR+=src +override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) endif ifeq ($(FULL_TARGET),arm-symbian) -override COMPILER_SOURCEDIR+=src +override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) endif ifeq ($(FULL_TARGET),powerpc64-linux) -override COMPILER_SOURCEDIR+=src +override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/unix endif ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src +override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/unix endif ifeq ($(FULL_TARGET),powerpc64-embedded) -override COMPILER_SOURCEDIR+=src +override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) +endif +ifeq ($(FULL_TARGET),i386-linux) +override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src +endif +ifeq ($(FULL_TARGET),i386-win32) +override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src +endif +ifeq ($(FULL_TARGET),i386-os2) +override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src +endif +ifeq ($(FULL_TARGET),i386-beos) +override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src +endif +ifeq ($(FULL_TARGET),i386-solaris) +override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src +endif +ifeq ($(FULL_TARGET),i386-qnx) +override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src +endif +ifeq ($(FULL_TARGET),i386-netware) +override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src +endif +ifeq ($(FULL_TARGET),i386-darwin) +override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src +endif +ifeq ($(FULL_TARGET),i386-emx) +override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src +endif +ifeq ($(FULL_TARGET),i386-watcom) +override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src +endif +ifeq ($(FULL_TARGET),i386-wince) +override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src +endif +ifeq ($(FULL_TARGET),i386-embedded) +override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src +endif +ifeq ($(FULL_TARGET),i386-symbian) +override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src +endif +ifeq ($(FULL_TARGET),m68k-linux) +override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src +endif +ifeq ($(FULL_TARGET),m68k-atari) +override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src +endif +ifeq ($(FULL_TARGET),sparc-linux) +override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src +endif +ifeq ($(FULL_TARGET),arm-linux) +override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src +endif +ifeq ($(FULL_TARGET),arm-palmos) +override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src +endif +ifeq ($(FULL_TARGET),arm-wince) +override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src +endif +ifeq ($(FULL_TARGET),arm-gba) +override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src +endif +ifeq ($(FULL_TARGET),arm-nds) +override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src +endif +ifeq ($(FULL_TARGET),arm-embedded) +override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src +endif +ifeq ($(FULL_TARGET),arm-symbian) +override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) diff --git a/packages/fcl-net/Makefile.fpc b/packages/fcl-net/Makefile.fpc index 07da812e7e..1cdab4239d 100644 --- a/packages/fcl-net/Makefile.fpc +++ b/packages/fcl-net/Makefile.fpc @@ -29,7 +29,20 @@ packages=netdb fcl-base fcl-xml fcl-passrc fcl-async [compiler] options=-S2h -sourcedir=src +includedir=src/$(OS_TARGET) +includedir_linux=src/unix +includedir_freebsd=src/unix +includedir_darwin=src/unix +includedir_netbsd=src/unix +includedir_openbsd=src/unix +includedir_solaris=src/unix +includedir_qnx=src/unix +includedir_beos=src/unix +includedir_emx=src/os2 +includedir_win32=src/win +includedir_win64=src/win +includedir_wince=src/win +sourcedir=src/$(OS_TARGET) src [install] fpcpackage=y