+ move fpasync to FCL

packages/extra/Makefile

@@ -1,8 +1,8 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2003/02/16]
+# 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)
@@ -204,7 +213,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
 ifeq ($(OS_TARGET),linux)
-override TARGET_DIRS+=unzip uncgi fpasync x11 opengl gtk syslog forms svgalib ggi libpng libgd utmp cmem bfd zlib gdbm ncurses tcl cdrom imlib gnome1 fpgtk
+override TARGET_DIRS+=unzip uncgi x11 opengl gtk syslog forms svgalib ggi libpng libgd utmp cmem bfd zlib gdbm ncurses tcl cdrom imlib gnome1 fpgtk
 endif
 ifeq ($(OS_TARGET),go32v2)
 override TARGET_DIRS+=unzip uncgi
@@ -216,13 +225,16 @@ ifeq ($(OS_TARGET),os2)
 override TARGET_DIRS+=unzip uncgi zlib os2units rexx x11 gtk fpgtk
 endif
 ifeq ($(OS_TARGET),freebsd)
-override TARGET_DIRS+=unzip uncgi fpasync x11 opengl gtk syslog forms svgalib ggi libpng libgd utmp cmem bfd zlib gdbm ncurses fpgtk
+override TARGET_DIRS+=unzip uncgi x11 opengl gtk syslog forms svgalib ggi libpng libgd utmp cmem bfd zlib gdbm ncurses fpgtk
 endif
 ifeq ($(OS_TARGET),netbsd)
-override TARGET_DIRS+=unzip uncgi fpasync x11 opengl gtk syslog forms svgalib ggi libpng libgd utmp cmem bfd zlib gdbm ncurses fpgtk
+override TARGET_DIRS+=unzip uncgi x11 opengl gtk syslog forms svgalib ggi libpng libgd utmp cmem bfd zlib gdbm ncurses fpgtk
+endif
+ifeq ($(OS_TARGET),netware)
+override TARGET_DIRS+=cmem zlib
 endif
 ifeq ($(OS_TARGET),openbsd)
-override TARGET_DIRS+=unzip uncgi fpasync x11 opengl gtk syslog forms svgalib ggi libpng libgd utmp cmem bfd zlib gdbm ncurses fpgtk
+override TARGET_DIRS+=unzip uncgi  x11 opengl gtk syslog forms svgalib ggi libpng libgd utmp cmem bfd zlib gdbm ncurses fpgtk
 endif
 override INSTALL_FPCPACKAGE=y
 override INSTALL_FPCSUBDIR=packages/extra
@@ -555,15 +567,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),)
@@ -875,11 +878,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
@@ -1057,7 +1055,6 @@ fpc_makefiles: fpc_makefile fpc_makefile_dirs
 ifeq ($(OS_TARGET),linux)
 TARGET_DIRS_UNZIP=1
 TARGET_DIRS_UNCGI=1
-TARGET_DIRS_FPASYNC=1
 TARGET_DIRS_X11=1
 TARGET_DIRS_OPENGL=1
 TARGET_DIRS_GTK=1
@@ -1107,7 +1104,6 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 TARGET_DIRS_UNZIP=1
 TARGET_DIRS_UNCGI=1
-TARGET_DIRS_FPASYNC=1
 TARGET_DIRS_X11=1
 TARGET_DIRS_OPENGL=1
 TARGET_DIRS_GTK=1
@@ -1128,7 +1124,6 @@ endif
 ifeq ($(OS_TARGET),netbsd)
 TARGET_DIRS_UNZIP=1
 TARGET_DIRS_UNCGI=1
-TARGET_DIRS_FPASYNC=1
 TARGET_DIRS_X11=1
 TARGET_DIRS_OPENGL=1
 TARGET_DIRS_GTK=1
@@ -1146,10 +1141,13 @@ TARGET_DIRS_GDBM=1
 TARGET_DIRS_NCURSES=1
 TARGET_DIRS_FPGTK=1
 endif
+ifeq ($(OS_TARGET),netware)
+TARGET_DIRS_CMEM=1
+TARGET_DIRS_ZLIB=1
+endif
 ifeq ($(OS_TARGET),openbsd)
 TARGET_DIRS_UNZIP=1
 TARGET_DIRS_UNCGI=1
-TARGET_DIRS_FPASYNC=1
 TARGET_DIRS_X11=1
 TARGET_DIRS_OPENGL=1
 TARGET_DIRS_GTK=1
@@ -1253,49 +1251,6 @@ uncgi:
 	$(MAKE) -C uncgi all
 .PHONY: uncgi_all uncgi_debug uncgi_smart uncgi_release uncgi_examples uncgi_shared uncgi_install uncgi_sourceinstall uncgi_exampleinstall uncgi_distinstall uncgi_zipinstall uncgi_zipsourceinstall uncgi_zipexampleinstall uncgi_zipdistinstall uncgi_clean uncgi_distclean uncgi_cleanall uncgi_info uncgi_makefiles uncgi
 endif
-ifdef TARGET_DIRS_FPASYNC
-fpasync_all:
-	$(MAKE) -C fpasync all
-fpasync_debug:
-	$(MAKE) -C fpasync debug
-fpasync_smart:
-	$(MAKE) -C fpasync smart
-fpasync_release:
-	$(MAKE) -C fpasync release
-fpasync_examples:
-	$(MAKE) -C fpasync examples
-fpasync_shared:
-	$(MAKE) -C fpasync shared
-fpasync_install:
-	$(MAKE) -C fpasync install
-fpasync_sourceinstall:
-	$(MAKE) -C fpasync sourceinstall
-fpasync_exampleinstall:
-	$(MAKE) -C fpasync exampleinstall
-fpasync_distinstall:
-	$(MAKE) -C fpasync distinstall
-fpasync_zipinstall:
-	$(MAKE) -C fpasync zipinstall
-fpasync_zipsourceinstall:
-	$(MAKE) -C fpasync zipsourceinstall
-fpasync_zipexampleinstall:
-	$(MAKE) -C fpasync zipexampleinstall
-fpasync_zipdistinstall:
-	$(MAKE) -C fpasync zipdistinstall
-fpasync_clean:
-	$(MAKE) -C fpasync clean
-fpasync_distclean:
-	$(MAKE) -C fpasync distclean
-fpasync_cleanall:
-	$(MAKE) -C fpasync cleanall
-fpasync_info:
-	$(MAKE) -C fpasync info
-fpasync_makefiles:
-	$(MAKE) -C fpasync makefiles
-fpasync:
-	$(MAKE) -C fpasync all
-.PHONY: fpasync_all fpasync_debug fpasync_smart fpasync_release fpasync_examples fpasync_shared fpasync_install fpasync_sourceinstall fpasync_exampleinstall fpasync_distinstall fpasync_zipinstall fpasync_zipsourceinstall fpasync_zipexampleinstall fpasync_zipdistinstall fpasync_clean fpasync_distclean fpasync_cleanall fpasync_info fpasync_makefiles fpasync
-endif
 ifdef TARGET_DIRS_X11
 x11_all:
 	$(MAKE) -C x11 all

packages/extra/Makefile.fpc

@@ -2,20 +2,20 @@
 #   Makefile.fpc for Free Pascal Packages
 #
 [target]
-dirs_linux=unzip uncgi fpasync \
+dirs_linux=unzip uncgi \
            x11 opengl gtk syslog \
            forms svgalib ggi libpng libgd \
            utmp cmem bfd zlib gdbm ncurses tcl cdrom \
            imlib gnome1 fpgtk
-dirs_netbsd=unzip uncgi fpasync \
+dirs_netbsd=unzip uncgi \
             x11 opengl gtk syslog \
             forms svgalib ggi libpng libgd \
             utmp cmem bfd zlib gdbm ncurses fpgtk
-dirs_freebsd=unzip uncgi fpasync \
+dirs_freebsd=unzip uncgi \
              x11 opengl gtk syslog \
              forms svgalib ggi libpng libgd \
              utmp cmem bfd zlib gdbm ncurses fpgtk
-dirs_openbsd=unzip uncgi fpasync \
+dirs_openbsd=unzip uncgi  \
              x11 opengl gtk syslog \
              forms svgalib ggi libpng libgd \
              utmp cmem bfd zlib gdbm ncurses fpgtk