Browse Source

* remove duplicate dbf_wtil

git-svn-id: trunk@2557 -
peter 19 years ago
parent
commit
d38469aecb
2 changed files with 1 additions and 15 deletions
  1. 1 7
      fcl/db/dbase/Makefile
  2. 0 8
      fcl/db/dbase/Makefile.fpc

+ 1 - 7
fcl/db/dbase/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/02/12]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/02/13]
 #
 #
 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-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 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-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 powerpc64-linux
@@ -232,12 +232,6 @@ endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
 override PACKAGE_NAME=fcl
 override PACKAGE_NAME=fcl
 PACKAGEDIR_MAIN:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl/Makefile.fpc,$(PACKAGESDIR))))))
 PACKAGEDIR_MAIN:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl/Makefile.fpc,$(PACKAGESDIR))))))
-ifeq ($(CPU_TARGET),i386)
-ifneq ($(OS_TARGET),win32)
-INSTALL_UNITS+=dbf_wtil
-CLEAN_UNITS+=dbf_wtil
-endif
-endif
 ifneq ($(OS_TARGET),win32)
 ifneq ($(OS_TARGET),win32)
 ifeq ($(CPU_TARGET),i386)
 ifeq ($(CPU_TARGET),i386)
 INSTALL_UNITS+=dbf_wtil
 INSTALL_UNITS+=dbf_wtil

+ 0 - 8
fcl/db/dbase/Makefile.fpc

@@ -35,14 +35,6 @@ units=dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur \
       dbf_prscore dbf_prsdef dbf_prssupp dbf_str
       dbf_prscore dbf_prsdef dbf_prssupp dbf_str
 
 
 [prerules]
 [prerules]
-# dbf_Wtil is needed on all targets except win32
-ifeq ($(CPU_TARGET),i386)
-ifneq ($(OS_TARGET),win32)
-INSTALL_UNITS+=dbf_wtil
-CLEAN_UNITS+=dbf_wtil
-endif
-endif
-
 # dbf_Wtil is needed on all targets except win32
 # dbf_Wtil is needed on all targets except win32
 ifneq ($(OS_TARGET),win32)
 ifneq ($(OS_TARGET),win32)