Browse Source

+ Added netdb implementation for linux

michael 22 years ago
parent
commit
c86f5f9f5e
2 changed files with 76 additions and 37 deletions
  1. 75 36
      packages/base/Makefile
  2. 1 1
      packages/base/Makefile.fpc

+ 75 - 36
packages/base/Makefile

@@ -1,8 +1,8 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2003/01/14]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/10/05]
 #
 default: all
-MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos macosx
+MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
@@ -58,7 +58,7 @@ ifdef inUnix
 PATHSEP=/
 else
 PATHSEP:=$(subst /,\,/)
-ifdef inCygWin
+ifneq ($(findstring sh.exe,$(SHELL)),)
 PATHSEP=/
 endif
 endif
@@ -111,38 +111,47 @@ endif
 override FPC:=$(subst $(SRCEXEEXT),,$(FPC))
 override FPC:=$(subst \,/,$(FPC))$(SRCEXEEXT)
 ifndef FPC_VERSION
-FPC_COMPILERINFO:=$(shell $(FPC) -iVSPTPSOTO)
-FPC_VERSION:=$(word 1,$(FPC_COMPILERINFO))
+FPC_VERSION:=$(shell $(FPC) -iV)
 endif
-export FPC FPC_VERSION FPC_COMPILERINFO
+export FPC FPC_VERSION
 unexport CHECKDEPEND ALLDEPENDENCIES
+ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
+COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
+ifndef CPU_SOURCE
+CPU_SOURCE:=$(word 1,$(COMPILERINFO))
+endif
 ifndef CPU_TARGET
-ifdef CPU_TARGET_DEFAULT
-CPU_TARGET=$(CPU_TARGET_DEFAULT)
+CPU_TARGET:=$(word 2,$(COMPILERINFO))
 endif
+ifndef OS_SOURCE
+OS_SOURCE:=$(word 3,$(COMPILERINFO))
 endif
 ifndef OS_TARGET
-ifdef OS_TARGET_DEFAULT
-OS_TARGET=$(OS_TARGET_DEFAULT)
-endif
-endif
-ifneq ($(words $(FPC_COMPILERINFO)),5)
-FPC_COMPILERINFO+=$(shell $(FPC) -iSP)
-FPC_COMPILERINFO+=$(shell $(FPC) -iTP)
-FPC_COMPILERINFO+=$(shell $(FPC) -iSO)
-FPC_COMPILERINFO+=$(shell $(FPC) -iTO)
+OS_TARGET:=$(word 4,$(COMPILERINFO))
 endif
+else
 ifndef CPU_SOURCE
-CPU_SOURCE:=$(word 2,$(FPC_COMPILERINFO))
+CPU_SOURCE:=$(shell $(FPC) -iSP)
 endif
 ifndef CPU_TARGET
-CPU_TARGET:=$(word 3,$(FPC_COMPILERINFO))
+CPU_TARGET:=$(shell $(FPC) -iTP)
 endif
 ifndef OS_SOURCE
-OS_SOURCE:=$(word 4,$(FPC_COMPILERINFO))
+OS_SOURCE:=$(shell $(FPC) -iSO)
 endif
 ifndef OS_TARGET
-OS_TARGET:=$(word 5,$(FPC_COMPILERINFO))
+OS_TARGET:=$(shell $(FPC) -iTO)
+endif
+endif
+ifndef CPU_TARGET
+ifdef CPU_TARGET_DEFAULT
+CPU_TARGET=$(CPU_TARGET_DEFAULT)
+endif
+endif
+ifndef OS_TARGET
+ifdef OS_TARGET_DEFAULT
+OS_TARGET=$(OS_TARGET_DEFAULT)
+endif
 endif
 FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)
 FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)
@@ -205,7 +214,7 @@ endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
 override TARGET_DIRS+=paszlib regexpr
 ifeq ($(OS_TARGET),linux)
-override TARGET_DIRS+=inet gdbint libasync mysql ibase postgres oracle odbc
+override TARGET_DIRS+=inet gdbint libasync mysql ibase postgres oracle odbc netdb
 endif
 ifeq ($(OS_TARGET),go32v2)
 override TARGET_DIRS+=gdbint
@@ -553,15 +562,6 @@ FPCMADE=fpcmade.nw
 ZIPSUFFIX=nw
 EXEEXT=.nlm
 endif
-ifeq ($(OS_TARGET),macos)
-PPUEXT=.ppu
-ASMEXT=.s
-OEXT=.o
-SMARTEXT=.sl
-STATICLIBEXT=.a
-EXEEXT=
-FPCMADE=fpcmade.mcc
-endif
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -873,11 +873,6 @@ override COMPILER_UNITTARGETDIR=$(COMPILER_TARGETDIR)
 override UNITTARGETDIRPREFIX=$(TARGETDIRPREFIX)
 endif
 endif
-ifeq ($(OS_TARGET),linux)
-ifeq ($(FPC_VERSION),1.0.6)
-override FPCOPTDEF+=HASUNIX
-endif
-endif
 ifdef OPT
 override FPCOPT+=$(OPT)
 endif
@@ -1063,6 +1058,7 @@ TARGET_DIRS_IBASE=1
 TARGET_DIRS_POSTGRES=1
 TARGET_DIRS_ORACLE=1
 TARGET_DIRS_ODBC=1
+TARGET_DIRS_NETDB=1
 endif
 ifeq ($(OS_TARGET),go32v2)
 TARGET_DIRS_GDBINT=1
@@ -1531,6 +1527,49 @@ odbc:
 	$(MAKE) -C odbc all
 .PHONY: odbc_all odbc_debug odbc_smart odbc_release odbc_examples odbc_shared odbc_install odbc_sourceinstall odbc_exampleinstall odbc_distinstall odbc_zipinstall odbc_zipsourceinstall odbc_zipexampleinstall odbc_zipdistinstall odbc_clean odbc_distclean odbc_cleanall odbc_info odbc_makefiles odbc
 endif
+ifdef TARGET_DIRS_NETDB
+netdb_all:
+	$(MAKE) -C netdb all
+netdb_debug:
+	$(MAKE) -C netdb debug
+netdb_smart:
+	$(MAKE) -C netdb smart
+netdb_release:
+	$(MAKE) -C netdb release
+netdb_examples:
+	$(MAKE) -C netdb examples
+netdb_shared:
+	$(MAKE) -C netdb shared
+netdb_install:
+	$(MAKE) -C netdb install
+netdb_sourceinstall:
+	$(MAKE) -C netdb sourceinstall
+netdb_exampleinstall:
+	$(MAKE) -C netdb exampleinstall
+netdb_distinstall:
+	$(MAKE) -C netdb distinstall
+netdb_zipinstall:
+	$(MAKE) -C netdb zipinstall
+netdb_zipsourceinstall:
+	$(MAKE) -C netdb zipsourceinstall
+netdb_zipexampleinstall:
+	$(MAKE) -C netdb zipexampleinstall
+netdb_zipdistinstall:
+	$(MAKE) -C netdb zipdistinstall
+netdb_clean:
+	$(MAKE) -C netdb clean
+netdb_distclean:
+	$(MAKE) -C netdb distclean
+netdb_cleanall:
+	$(MAKE) -C netdb cleanall
+netdb_info:
+	$(MAKE) -C netdb info
+netdb_makefiles:
+	$(MAKE) -C netdb makefiles
+netdb:
+	$(MAKE) -C netdb all
+.PHONY: netdb_all netdb_debug netdb_smart netdb_release netdb_examples netdb_shared netdb_install netdb_sourceinstall netdb_exampleinstall netdb_distinstall netdb_zipinstall netdb_zipsourceinstall netdb_zipexampleinstall netdb_zipdistinstall netdb_clean netdb_distclean netdb_cleanall netdb_info netdb_makefiles netdb
+endif
 all: $(addsuffix _all,$(TARGET_DIRS))
 debug: $(addsuffix _debug,$(TARGET_DIRS))
 smart: $(addsuffix _smart,$(TARGET_DIRS))

+ 1 - 1
packages/base/Makefile.fpc

@@ -5,7 +5,7 @@
 [target]
 dirs=paszlib regexpr
 dirs_linux=inet gdbint libasync \
-           mysql ibase postgres oracle odbc
+           mysql ibase postgres oracle odbc netdb
 dirs_win32=inet gdbint \
            mysql ibase odbc
 dirs_go32v2=gdbint