Browse Source

+ skeleton for contnr.pas added

florian 23 years ago
parent
commit
5425f8ec8c
2 changed files with 14 additions and 29 deletions
  1. 4 10
      fcl/Makefile
  2. 10 19
      fcl/Makefile.fpc

+ 4 - 10
fcl/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/05/02]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/04/23]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware
@@ -199,7 +199,7 @@ PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/ext
 override PACKAGE_NAME=fcl
 override PACKAGE_VERSION=1.0.6
 override TARGET_DIRS+=xml db shedit
-override TARGET_UNITS+=classes inifiles registry ezcgi pipes rtfpars idea base64 gettext iostream zstream cachecls
+override TARGET_UNITS+=classes contnrs inifiles registry ezcgi pipes rtfpars idea base64 gettext iostream zstream cachecls
 ifeq ($(OS_TARGET),linux)
 override TARGET_UNITS+=process asyncio ssockets http
 endif
@@ -254,9 +254,6 @@ endif
 ifeq ($(OS_TARGET),sunos)
 UNIXINSTALLDIR=1
 endif
-ifeq ($(OS_TARGET),qnx)
-UNIXINSTALLDIR=1
-endif
 else
 ifeq ($(OS_SOURCE),linux)
 UNIXINSTALLDIR=1
@@ -270,9 +267,6 @@ endif
 ifeq ($(OS_TARGET),sunos)
 UNIXINSTALLDIR=1
 endif
-ifeq ($(OS_TARGET),qnx)
-UNIXINSTALLDIR=1
-endif
 endif
 ifndef INSTALL_PREFIX
 ifdef PREFIX
@@ -507,7 +501,7 @@ ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
-PPUEXT=.ppu
+PPUEXT=.ppa
 ASMEXT=.asm
 OEXT=.o
 SMARTEXT=.sl
@@ -516,7 +510,7 @@ SHAREDLIBEXT=.library
 FPCMADE=fpcmade.amg
 endif
 ifeq ($(OS_TARGET),atari)
-PPUEXT=.ppu
+PPUEXT=.ppt
 ASMEXT=.s
 OEXT=.o
 SMARTEXT=.sl

+ 10 - 19
fcl/Makefile.fpc

@@ -8,26 +8,22 @@ version=1.0.6
 
 [require]
 packages=paszlib
-packages_linux=netdb libasync
-packages_freebsd=netdb libasync
-packages_netbsd=netdb libasync
-packages_openbsd=netdb libasync
-packages_win32=netdb
+packages_linux=inet
+packages_freebsd=inet
+packages_netbsd=inet
 
 # clean package units
 [clean]
 units=adler gzcrc gzio infblock infcodes inffast inftrees infutil minigzip paszlib trees zbase zcompres zdeflate zinflate zuncompr zutil
 
 [target]
-dirs=xml db shedit passrc net
-units=classes contnrs inifiles ezcgi pipes rtfpars idea base64 gettext iostream zstream cachecls xmlreg registry eventlog
-units_freebsd=process ssockets resolve fpasync
-units_netbsd=process ssockets resolve fpasync
-units_openbsd=process ssockets resolve fpasync
-units_linux=process resolve ssockets fpasync
-units_win32=process fileinfo resolve ssockets
-units_netware=resolve ssockets
-rsts=classes ssockets cachecls resolve
+dirs=xml db shedit
+units=classes contnrs inifiles registry ezcgi pipes rtfpars idea base64 gettext iostream zstream cachecls
+units_freebsd=process asyncio ssockets http
+units_netbsd=process asyncio ssockets http
+units_linux=process asyncio ssockets http
+units_win32=process fileinfo
+rsts=classes ssockets cachecls
 exampledirs=tests
 
 [compiler]
@@ -37,10 +33,8 @@ includedir=$(OS_TARGET) inc
 includedir_linux=unix
 includedir_freebsd=unix
 includedir_netbsd=unix
-includedir_openbsd=unix
 includedir_sunos=posix
 includedir_qnx=posix
-includedir_emx=os2
 sourcedir=$(OS_TARGET) inc
 
 [libs]
@@ -51,6 +45,3 @@ fpcpackage=y
 
 [default]
 fpcdir=..
-
-[rules]
-xmlreg.pp: xml