ソースを参照

* web dir only for targets also having dbugintf

git-svn-id: trunk@5143 -
peter 19 年 前
コミット
f0e8ef9e2a
2 ファイル変更54 行追加62 行削除
  1. 43 60
      fcl/Makefile
  2. 11 2
      fcl/Makefile.fpc

+ 43 - 60
fcl/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/08/20]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/10/31]
 #
 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
@@ -233,127 +233,127 @@ PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/ext
 override PACKAGE_NAME=fcl
 override PACKAGE_VERSION=2.0.0
 ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_DIRS+=xml image db shedit passrc net fpcunit web
+override TARGET_DIRS+=xml image db shedit passrc net fpcunit  web
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_DIRS+=xml image db shedit passrc net fpcunit web
+override TARGET_DIRS+=xml image db shedit passrc net fpcunit
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_DIRS+=xml image db shedit passrc net fpcunit web
+override TARGET_DIRS+=xml image db shedit passrc net fpcunit  web
 endif
 ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_DIRS+=xml image db shedit passrc net fpcunit web
+override TARGET_DIRS+=xml image db shedit passrc net fpcunit
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_DIRS+=xml image db shedit passrc net fpcunit web
+override TARGET_DIRS+=xml image db shedit passrc net fpcunit  web
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_DIRS+=xml image db shedit passrc net fpcunit web
+override TARGET_DIRS+=xml image db shedit passrc net fpcunit
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_DIRS+=xml image db shedit passrc net fpcunit web
+override TARGET_DIRS+=xml image db shedit passrc net fpcunit  web
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_DIRS+=xml image db shedit passrc net fpcunit web
+override TARGET_DIRS+=xml image db shedit passrc net fpcunit  web
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_DIRS+=xml image db shedit passrc net fpcunit web
+override TARGET_DIRS+=xml image db shedit passrc net fpcunit
 endif
 ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_DIRS+=xml image db shedit passrc net fpcunit web
+override TARGET_DIRS+=xml image db shedit passrc net fpcunit
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_DIRS+=xml image db shedit passrc net fpcunit web
+override TARGET_DIRS+=xml image db shedit passrc net fpcunit  web
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_DIRS+=xml image db shedit passrc net fpcunit web
+override TARGET_DIRS+=xml image db shedit passrc net fpcunit
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_DIRS+=xml image db shedit passrc net fpcunit web
+override TARGET_DIRS+=xml image db shedit passrc net fpcunit  web
 endif
 ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_DIRS+=xml image db shedit passrc net fpcunit web
+override TARGET_DIRS+=xml image db shedit passrc net fpcunit
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_DIRS+=xml image db shedit passrc net fpcunit web
+override TARGET_DIRS+=xml image db shedit passrc net fpcunit
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_DIRS+=xml image db shedit passrc net fpcunit web
+override TARGET_DIRS+=xml image db shedit passrc net fpcunit
 endif
 ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_DIRS+=xml image db shedit passrc net fpcunit web
+override TARGET_DIRS+=xml image db shedit passrc net fpcunit  web
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_DIRS+=xml image db shedit passrc net fpcunit web
+override TARGET_DIRS+=xml image db shedit passrc net fpcunit  web
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_DIRS+=xml image db shedit passrc net fpcunit web
+override TARGET_DIRS+=xml image db shedit passrc net fpcunit  web
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_DIRS+=xml image db shedit passrc net fpcunit web
+override TARGET_DIRS+=xml image db shedit passrc net fpcunit  web
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_DIRS+=xml image db shedit passrc net fpcunit web
+override TARGET_DIRS+=xml image db shedit passrc net fpcunit
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_DIRS+=xml image db shedit passrc net fpcunit web
+override TARGET_DIRS+=xml image db shedit passrc net fpcunit
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_DIRS+=xml image db shedit passrc net fpcunit web
+override TARGET_DIRS+=xml image db shedit passrc net fpcunit  web
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_DIRS+=xml image db shedit passrc net fpcunit web
+override TARGET_DIRS+=xml image db shedit passrc net fpcunit
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_DIRS+=xml image db shedit passrc net fpcunit web
+override TARGET_DIRS+=xml image db shedit passrc net fpcunit  web
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_DIRS+=xml image db shedit passrc net fpcunit web
+override TARGET_DIRS+=xml image db shedit passrc net fpcunit  web
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_DIRS+=xml image db shedit passrc net fpcunit web
+override TARGET_DIRS+=xml image db shedit passrc net fpcunit
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_DIRS+=xml image db shedit passrc net fpcunit web
+override TARGET_DIRS+=xml image db shedit passrc net fpcunit
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_DIRS+=xml image db shedit passrc net fpcunit web
+override TARGET_DIRS+=xml image db shedit passrc net fpcunit  web
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_DIRS+=xml image db shedit passrc net fpcunit web
+override TARGET_DIRS+=xml image db shedit passrc net fpcunit
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_DIRS+=xml image db shedit passrc net fpcunit web
+override TARGET_DIRS+=xml image db shedit passrc net fpcunit  web
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_DIRS+=xml image db shedit passrc net fpcunit web
+override TARGET_DIRS+=xml image db shedit passrc net fpcunit  web
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_DIRS+=xml image db shedit passrc net fpcunit web
+override TARGET_DIRS+=xml image db shedit passrc net fpcunit  web
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_DIRS+=xml image db shedit passrc net fpcunit web
+override TARGET_DIRS+=xml image db shedit passrc net fpcunit  web
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_DIRS+=xml image db shedit passrc net fpcunit web
+override TARGET_DIRS+=xml image db shedit passrc net fpcunit  web
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_DIRS+=xml image db shedit passrc net fpcunit web
+override TARGET_DIRS+=xml image db shedit passrc net fpcunit  web
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_DIRS+=xml image db shedit passrc net fpcunit web
+override TARGET_DIRS+=xml image db shedit passrc net fpcunit  web
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_DIRS+=xml image db shedit passrc net fpcunit web
+override TARGET_DIRS+=xml image db shedit passrc net fpcunit
 endif
 ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_DIRS+=xml image db shedit passrc net fpcunit web
+override TARGET_DIRS+=xml image db shedit passrc net fpcunit  web
 endif
 ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_DIRS+=xml image db shedit passrc net fpcunit web
+override TARGET_DIRS+=xml image db shedit passrc net fpcunit
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_DIRS+=xml image db shedit passrc net fpcunit web
+override TARGET_DIRS+=xml image db shedit passrc net fpcunit  web
 endif
 ifeq ($(FULL_TARGET),i386-linux)
 override TARGET_UNITS+=contnrs inifiles ezcgi pipes rtfpars idea base64 gettext iostream zstream cachecls avl_tree htmldefs xmlreg registry eventlog custapp cgiapp wformat whtml wtex rttiutils bufstream streamex blowfish zipper streamio inicol pooledmm libtar streamcoll  process resolve ssockets fpasync syncobjs simpleipc dbugmsg dbugintf
@@ -2822,7 +2822,7 @@ ifeq ($(CPU_TARGET),powerpc)
 FPCCPUOPT:=-O1r
 endif
 else
-FPCCPUOPT:=-O1r
+FPCCPUOPT:=-O2
 endif
 override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
@@ -3366,7 +3366,6 @@ TARGET_DIRS_SHEDIT=1
 TARGET_DIRS_PASSRC=1
 TARGET_DIRS_NET=1
 TARGET_DIRS_FPCUNIT=1
-TARGET_DIRS_WEB=1
 endif
 ifeq ($(FULL_TARGET),i386-win32)
 TARGET_DIRS_XML=1
@@ -3386,7 +3385,6 @@ TARGET_DIRS_SHEDIT=1
 TARGET_DIRS_PASSRC=1
 TARGET_DIRS_NET=1
 TARGET_DIRS_FPCUNIT=1
-TARGET_DIRS_WEB=1
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
 TARGET_DIRS_XML=1
@@ -3406,7 +3404,6 @@ TARGET_DIRS_SHEDIT=1
 TARGET_DIRS_PASSRC=1
 TARGET_DIRS_NET=1
 TARGET_DIRS_FPCUNIT=1
-TARGET_DIRS_WEB=1
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 TARGET_DIRS_XML=1
@@ -3436,7 +3433,6 @@ TARGET_DIRS_SHEDIT=1
 TARGET_DIRS_PASSRC=1
 TARGET_DIRS_NET=1
 TARGET_DIRS_FPCUNIT=1
-TARGET_DIRS_WEB=1
 endif
 ifeq ($(FULL_TARGET),i386-netware)
 TARGET_DIRS_XML=1
@@ -3446,7 +3442,6 @@ TARGET_DIRS_SHEDIT=1
 TARGET_DIRS_PASSRC=1
 TARGET_DIRS_NET=1
 TARGET_DIRS_FPCUNIT=1
-TARGET_DIRS_WEB=1
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
 TARGET_DIRS_XML=1
@@ -3466,7 +3461,6 @@ TARGET_DIRS_SHEDIT=1
 TARGET_DIRS_PASSRC=1
 TARGET_DIRS_NET=1
 TARGET_DIRS_FPCUNIT=1
-TARGET_DIRS_WEB=1
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
 TARGET_DIRS_XML=1
@@ -3486,7 +3480,6 @@ TARGET_DIRS_SHEDIT=1
 TARGET_DIRS_PASSRC=1
 TARGET_DIRS_NET=1
 TARGET_DIRS_FPCUNIT=1
-TARGET_DIRS_WEB=1
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
 TARGET_DIRS_XML=1
@@ -3496,7 +3489,6 @@ TARGET_DIRS_SHEDIT=1
 TARGET_DIRS_PASSRC=1
 TARGET_DIRS_NET=1
 TARGET_DIRS_FPCUNIT=1
-TARGET_DIRS_WEB=1
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
 TARGET_DIRS_XML=1
@@ -3506,7 +3498,6 @@ TARGET_DIRS_SHEDIT=1
 TARGET_DIRS_PASSRC=1
 TARGET_DIRS_NET=1
 TARGET_DIRS_FPCUNIT=1
-TARGET_DIRS_WEB=1
 endif
 ifeq ($(FULL_TARGET),i386-wince)
 TARGET_DIRS_XML=1
@@ -3556,7 +3547,6 @@ TARGET_DIRS_SHEDIT=1
 TARGET_DIRS_PASSRC=1
 TARGET_DIRS_NET=1
 TARGET_DIRS_FPCUNIT=1
-TARGET_DIRS_WEB=1
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
 TARGET_DIRS_XML=1
@@ -3566,7 +3556,6 @@ TARGET_DIRS_SHEDIT=1
 TARGET_DIRS_PASSRC=1
 TARGET_DIRS_NET=1
 TARGET_DIRS_FPCUNIT=1
-TARGET_DIRS_WEB=1
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
 TARGET_DIRS_XML=1
@@ -3586,7 +3575,6 @@ TARGET_DIRS_SHEDIT=1
 TARGET_DIRS_PASSRC=1
 TARGET_DIRS_NET=1
 TARGET_DIRS_FPCUNIT=1
-TARGET_DIRS_WEB=1
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
 TARGET_DIRS_XML=1
@@ -3616,7 +3604,6 @@ TARGET_DIRS_SHEDIT=1
 TARGET_DIRS_PASSRC=1
 TARGET_DIRS_NET=1
 TARGET_DIRS_FPCUNIT=1
-TARGET_DIRS_WEB=1
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
 TARGET_DIRS_XML=1
@@ -3626,7 +3613,6 @@ TARGET_DIRS_SHEDIT=1
 TARGET_DIRS_PASSRC=1
 TARGET_DIRS_NET=1
 TARGET_DIRS_FPCUNIT=1
-TARGET_DIRS_WEB=1
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
 TARGET_DIRS_XML=1
@@ -3646,7 +3632,6 @@ TARGET_DIRS_SHEDIT=1
 TARGET_DIRS_PASSRC=1
 TARGET_DIRS_NET=1
 TARGET_DIRS_FPCUNIT=1
-TARGET_DIRS_WEB=1
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
 TARGET_DIRS_XML=1
@@ -3726,7 +3711,6 @@ TARGET_DIRS_SHEDIT=1
 TARGET_DIRS_PASSRC=1
 TARGET_DIRS_NET=1
 TARGET_DIRS_FPCUNIT=1
-TARGET_DIRS_WEB=1
 endif
 ifeq ($(FULL_TARGET),arm-wince)
 TARGET_DIRS_XML=1
@@ -3746,7 +3730,6 @@ TARGET_DIRS_SHEDIT=1
 TARGET_DIRS_PASSRC=1
 TARGET_DIRS_NET=1
 TARGET_DIRS_FPCUNIT=1
-TARGET_DIRS_WEB=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 TARGET_DIRS_XML=1

+ 11 - 2
fcl/Makefile.fpc

@@ -22,10 +22,19 @@ packages_emx=netdb
 
 # clean package units
 [clean]
-units=adler gzcrc gzio infblock infcodes inffast inftrees infutil minigzip paszlib trees zbase zcompres zdeflate zinflate zuncompr zutil pthreads streamio blowfish 
+units=adler gzcrc gzio infblock infcodes inffast inftrees infutil minigzip paszlib trees zbase zcompres zdeflate zinflate zuncompr zutil pthreads streamio blowfish
 
 [target]
-dirs=xml image db shedit passrc net fpcunit web
+dirs=xml image db shedit passrc net fpcunit
+dirs_freebsd=web
+dirs_darwin=web
+dirs_solaris=web
+dirs_netbsd=web
+dirs_openbsd=web
+dirs_linux=web
+dirs_win32=web
+dirs_win64=web
+dirs_wince=web
 units=contnrs inifiles ezcgi pipes rtfpars idea base64 gettext \
       iostream zstream cachecls avl_tree htmldefs xmlreg registry \
       eventlog custapp cgiapp wformat whtml wtex rttiutils bufstream \