Browse Source

* removes unsupported stuff from OS2 makefiles

git-svn-id: trunk@5352 -
Almindor 19 years ago
parent
commit
8cdac28178
4 changed files with 13 additions and 6 deletions
  1. 3 3
      fcl/lnet/Makefile
  2. 1 0
      fcl/lnet/Makefile.fpc
  3. 8 3
      fcl/lnet/examples/Makefile
  4. 1 0
      fcl/lnet/examples/Makefile.fpc

+ 3 - 3
fcl/lnet/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/11/03]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/11/12]
 #
 #
 default: all
 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 m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-palmos arm-wince arm-gba powerpc64-linux
 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 m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-palmos arm-wince arm-gba powerpc64-linux
@@ -242,7 +242,7 @@ ifeq ($(FULL_TARGET),i386-win32)
 override TARGET_UNITS+=lnet lcommon levents lcontrolstack ltelnet lftp lsmtp lhttputil lhttp lmimetypes lprocess lstrbuffer fastcgi lfastcgi lspawnfcgi lwebserver
 override TARGET_UNITS+=lnet lcommon levents lcontrolstack ltelnet lftp lsmtp lhttputil lhttp lmimetypes lprocess lstrbuffer fastcgi lfastcgi lspawnfcgi lwebserver
 endif
 endif
 ifeq ($(FULL_TARGET),i386-os2)
 ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_UNITS+=lnet lcommon levents lcontrolstack ltelnet lftp lsmtp lhttputil lhttp lmimetypes lprocess lstrbuffer fastcgi lfastcgi lspawnfcgi lwebserver
+override TARGET_UNITS+=lnet lcommon levents lcontrolstack ltelnet lftp lsmtp lhttputil lhttp lmimetypes lprocess lstrbuffer fastcgi lfastcgi lspawnfcgi lwebserver  lnet lcommon levents lcontrolstack ltelnet lftp lsmtp
 endif
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
 ifeq ($(FULL_TARGET),i386-freebsd)
 override TARGET_UNITS+=lnet lcommon levents lcontrolstack ltelnet lftp lsmtp lhttputil lhttp lmimetypes lprocess lstrbuffer fastcgi lfastcgi lspawnfcgi lwebserver
 override TARGET_UNITS+=lnet lcommon levents lcontrolstack ltelnet lftp lsmtp lhttputil lhttp lmimetypes lprocess lstrbuffer fastcgi lfastcgi lspawnfcgi lwebserver
@@ -1736,7 +1736,7 @@ ifeq ($(CPU_TARGET),powerpc)
 FPCCPUOPT:=-O1r
 FPCCPUOPT:=-O1r
 endif
 endif
 else
 else
-FPCCPUOPT:=-O2
+FPCCPUOPT:=-O1r
 endif
 endif
 override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
 override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 override FPCOPTDEF+=RELEASE

+ 1 - 0
fcl/lnet/Makefile.fpc

@@ -8,6 +8,7 @@ main=fcl
 [target]
 [target]
 units=lnet lcommon levents lcontrolstack ltelnet lftp lsmtp lhttputil lhttp \
 units=lnet lcommon levents lcontrolstack ltelnet lftp lsmtp lhttputil lhttp \
       lmimetypes lprocess lstrbuffer fastcgi lfastcgi lspawnfcgi lwebserver
       lmimetypes lprocess lstrbuffer fastcgi lfastcgi lspawnfcgi lwebserver
+units_os2=lnet lcommon levents lcontrolstack ltelnet lftp lsmtp
 exampledirs=examples
 exampledirs=examples
 
 
 [require]
 [require]

+ 8 - 3
fcl/lnet/examples/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/11/03]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/11/12]
 #
 #
 default: all
 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 m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-palmos arm-wince arm-gba powerpc64-linux
 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 m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-palmos arm-wince arm-gba powerpc64-linux
@@ -240,7 +240,7 @@ ifeq ($(FULL_TARGET),i386-win32)
 override TARGET_DIRS+=ltcp ludp ltelnet lftp lsmtp lhttp
 override TARGET_DIRS+=ltcp ludp ltelnet lftp lsmtp lhttp
 endif
 endif
 ifeq ($(FULL_TARGET),i386-os2)
 ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_DIRS+=ltcp ludp ltelnet lftp lsmtp lhttp
+override TARGET_DIRS+=ltcp ludp ltelnet lftp lsmtp lhttp  ltcp ludp ltelnet lftp lsmtp
 endif
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
 ifeq ($(FULL_TARGET),i386-freebsd)
 override TARGET_DIRS+=ltcp ludp ltelnet lftp lsmtp lhttp
 override TARGET_DIRS+=ltcp ludp ltelnet lftp lsmtp lhttp
@@ -2082,7 +2082,7 @@ ifeq ($(CPU_TARGET),powerpc)
 FPCCPUOPT:=-O1r
 FPCCPUOPT:=-O1r
 endif
 endif
 else
 else
-FPCCPUOPT:=-O2
+FPCCPUOPT:=-O1r
 endif
 endif
 override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
 override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 override FPCOPTDEF+=RELEASE
@@ -2387,6 +2387,11 @@ TARGET_DIRS_LTELNET=1
 TARGET_DIRS_LFTP=1
 TARGET_DIRS_LFTP=1
 TARGET_DIRS_LSMTP=1
 TARGET_DIRS_LSMTP=1
 TARGET_DIRS_LHTTP=1
 TARGET_DIRS_LHTTP=1
+TARGET_DIRS_LTCP=1
+TARGET_DIRS_LUDP=1
+TARGET_DIRS_LTELNET=1
+TARGET_DIRS_LFTP=1
+TARGET_DIRS_LSMTP=1
 endif
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
 ifeq ($(FULL_TARGET),i386-freebsd)
 TARGET_DIRS_LTCP=1
 TARGET_DIRS_LTCP=1

+ 1 - 0
fcl/lnet/examples/Makefile.fpc

@@ -7,6 +7,7 @@ packages=fcl
 
 
 [target]
 [target]
 dirs=ltcp ludp ltelnet lftp lsmtp lhttp
 dirs=ltcp ludp ltelnet lftp lsmtp lhttp
+dirs_os2=ltcp ludp ltelnet lftp lsmtp
 
 
 [compiler]
 [compiler]
 options=-S2
 options=-S2