Browse Source

* disable dbase for non-i386 until it is really tested

peter 21 years ago
parent
commit
f94e763d8b
2 changed files with 18 additions and 48 deletions
  1. 16 47
      fcl/db/Makefile
  2. 2 1
      fcl/db/Makefile.fpc

+ 16 - 47
fcl/db/Makefile

@@ -1,8 +1,8 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/05/23]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/07/11]
 #
 default: all
-MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom
+MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos
 BSDs = freebsd netbsd openbsd darwin
 UNIXs = linux $(BSDs) sunos qnx
 FORCE:
@@ -214,7 +214,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
 override PACKAGE_NAME=fcl
-override TARGET_DIRS+=dbase sdf memds
+override TARGET_DIRS+=sdf memds
 ifeq ($(OS_TARGET),linux)
 override TARGET_DIRS+=mysql interbase sqlite
 endif
@@ -233,6 +233,9 @@ endif
 ifeq ($(OS_TARGET),darwin)
 override TARGET_DIRS+=mysql interbase sqlite
 endif
+ifeq ($(CPU_TARGET),i386)
+override TARGET_DIRS+=dbase
+endif
 override TARGET_UNITS+=db ddg_ds ddg_rec dbwhtml
 override TARGET_RSTS+=dbwhtml
 override TARGET_EXAMPLEDIRS+=tests
@@ -540,6 +543,11 @@ EXEEXT=
 SHAREDLIBEXT=.library
 FPCMADE=fpcmade.amg
 endif
+ifeq ($(OS_TARGET),morphos)
+EXEEXT=
+SHAREDLIBEXT=.library
+FPCMADE=fpcmade.mos
+endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
 FPCMADE=fpcmade.ata
@@ -1168,6 +1176,11 @@ ifeq ($(CPU_TARGET),i386)
 REQUIRE_PACKAGES_RTL=1
 endif
 endif
+ifeq ($(OS_TARGET),morphos)
+ifeq ($(CPU_TARGET),powerpc)
+REQUIRE_PACKAGES_RTL=1
+endif
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/$(OS_TARGET)/Makefile.fpc,$(PACKAGESDIR))))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -1692,7 +1705,6 @@ endif
 fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS))
 fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2
 fpc_makefiles: fpc_makefile fpc_makefile_dirs
-TARGET_DIRS_DBASE=1
 TARGET_DIRS_SDF=1
 TARGET_DIRS_MEMDS=1
 ifeq ($(OS_TARGET),linux)
@@ -1725,49 +1737,6 @@ TARGET_DIRS_MYSQL=1
 TARGET_DIRS_INTERBASE=1
 TARGET_DIRS_SQLITE=1
 endif
-ifdef TARGET_DIRS_DBASE
-dbase_all:
-	$(MAKE) -C dbase all
-dbase_debug:
-	$(MAKE) -C dbase debug
-dbase_smart:
-	$(MAKE) -C dbase smart
-dbase_release:
-	$(MAKE) -C dbase release
-dbase_examples:
-	$(MAKE) -C dbase examples
-dbase_shared:
-	$(MAKE) -C dbase shared
-dbase_install:
-	$(MAKE) -C dbase install
-dbase_sourceinstall:
-	$(MAKE) -C dbase sourceinstall
-dbase_exampleinstall:
-	$(MAKE) -C dbase exampleinstall
-dbase_distinstall:
-	$(MAKE) -C dbase distinstall
-dbase_zipinstall:
-	$(MAKE) -C dbase zipinstall
-dbase_zipsourceinstall:
-	$(MAKE) -C dbase zipsourceinstall
-dbase_zipexampleinstall:
-	$(MAKE) -C dbase zipexampleinstall
-dbase_zipdistinstall:
-	$(MAKE) -C dbase zipdistinstall
-dbase_clean:
-	$(MAKE) -C dbase clean
-dbase_distclean:
-	$(MAKE) -C dbase distclean
-dbase_cleanall:
-	$(MAKE) -C dbase cleanall
-dbase_info:
-	$(MAKE) -C dbase info
-dbase_makefiles:
-	$(MAKE) -C dbase makefiles
-dbase:
-	$(MAKE) -C dbase all
-.PHONY: dbase_all dbase_debug dbase_smart dbase_release dbase_examples dbase_shared dbase_install dbase_sourceinstall dbase_exampleinstall dbase_distinstall dbase_zipinstall dbase_zipsourceinstall dbase_zipexampleinstall dbase_zipdistinstall dbase_clean dbase_distclean dbase_cleanall dbase_info dbase_makefiles dbase
-endif
 ifdef TARGET_DIRS_SDF
 sdf_all:
 	$(MAKE) -C sdf all

+ 2 - 1
fcl/db/Makefile.fpc

@@ -6,7 +6,8 @@
 main=fcl
 
 [target]
-dirs=dbase sdf memds
+dirs=sdf memds
+dirs_i386=dbase
 dirs_linux=mysql interbase sqlite
 dirs_freebsd=mysql interbase sqlite
 dirs_darwin=mysql interbase sqlite