* regenerated

packages/extra/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/02/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/03/15]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom
@@ -209,7 +209,7 @@ endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
 override TARGET_DIRS+=uncgi
 ifeq ($(OS_TARGET),linux)
-override TARGET_DIRS+=unzip x11 opengl gtk syslog forms svgalib ggi libpng libgd utmp cmem bfd zlib gdbm ncurses tcl cdrom imlib gnome1 fpgtk unixutil
+override TARGET_DIRS+=unzip x11 opengl gtk syslog forms svgalib ggi libpng libgd utmp bfd zlib gdbm ncurses tcl cdrom imlib gnome1 fpgtk unixutil
 endif
 ifeq ($(OS_TARGET),go32v2)
 override TARGET_DIRS+=unzip
@@ -221,16 +221,16 @@ ifeq ($(OS_TARGET),os2)
 override TARGET_DIRS+=os2units rexx unzip x11 gtk libpng zlib tcl imlib fpgtk
 endif
 ifeq ($(OS_TARGET),freebsd)
-override TARGET_DIRS+=unzip x11 opengl gtk syslog forms svgalib ggi libpng libgd utmp cmem bfd zlib gdbm ncurses fpgtk tcl imlib gnome1
+override TARGET_DIRS+=unzip x11 opengl gtk syslog forms svgalib ggi libpng libgd utmp bfd zlib gdbm ncurses fpgtk tcl imlib gnome1
 endif
 ifeq ($(OS_TARGET),netbsd)
-override TARGET_DIRS+=unzip x11 opengl gtk syslog forms svgalib ggi libpng libgd utmp cmem bfd zlib gdbm ncurses fpgtk tcl imlib gnome1
+override TARGET_DIRS+=unzip x11 opengl gtk syslog forms svgalib ggi libpng libgd utmp bfd zlib gdbm ncurses fpgtk tcl imlib gnome1
 endif
 ifeq ($(OS_TARGET),netware)
-override TARGET_DIRS+=cmem zlib
+override TARGET_DIRS+=zlib
 endif
 ifeq ($(OS_TARGET),openbsd)
-override TARGET_DIRS+=unzip  x11 opengl gtk syslog forms svgalib ggi libpng libgd utmp cmem bfd zlib gdbm ncurses fpgtk tcl imlib gnome1
+override TARGET_DIRS+=unzip  x11 opengl gtk syslog forms svgalib ggi libpng libgd utmp bfd zlib gdbm ncurses fpgtk tcl imlib gnome1
 endif
 ifeq ($(OS_TARGET),emx)
 override TARGET_DIRS+=os2units rexx unzip x11 gtk libpng zlib tcl imlib fpgtk
@@ -546,7 +546,8 @@ ZIPSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),macos)
 EXEEXT=
-FPCMADE=fpcmade.mcc
+FPCMADE=fpcmade.macos
+ZIPSUFFIX=macos
 endif
 ifeq ($(OS_TARGET),darwin)
 EXEEXT=
@@ -845,9 +846,11 @@ ARNAME=$(BINUTILSPREFIX)ar
 RCNAME=$(BINUTILSPREFIX)rc
 ifneq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),win32)
-ASNAME=as
-LDNAME=ld
-ARNAME=ar
+ifeq ($(CROSSBINDIR),)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 endif
 endif
 ifndef ASPROG
@@ -1388,7 +1391,6 @@ TARGET_DIRS_GGI=1
 TARGET_DIRS_LIBPNG=1
 TARGET_DIRS_LIBGD=1
 TARGET_DIRS_UTMP=1
-TARGET_DIRS_CMEM=1
 TARGET_DIRS_BFD=1
 TARGET_DIRS_ZLIB=1
 TARGET_DIRS_GDBM=1
@@ -1438,7 +1440,6 @@ TARGET_DIRS_GGI=1
 TARGET_DIRS_LIBPNG=1
 TARGET_DIRS_LIBGD=1
 TARGET_DIRS_UTMP=1
-TARGET_DIRS_CMEM=1
 TARGET_DIRS_BFD=1
 TARGET_DIRS_ZLIB=1
 TARGET_DIRS_GDBM=1
@@ -1460,7 +1461,6 @@ TARGET_DIRS_GGI=1
 TARGET_DIRS_LIBPNG=1
 TARGET_DIRS_LIBGD=1
 TARGET_DIRS_UTMP=1
-TARGET_DIRS_CMEM=1
 TARGET_DIRS_BFD=1
 TARGET_DIRS_ZLIB=1
 TARGET_DIRS_GDBM=1
@@ -1471,7 +1471,6 @@ TARGET_DIRS_IMLIB=1
 TARGET_DIRS_GNOME1=1
 endif
 ifeq ($(OS_TARGET),netware)
-TARGET_DIRS_CMEM=1
 TARGET_DIRS_ZLIB=1
 endif
 ifeq ($(OS_TARGET),openbsd)
@@ -1486,7 +1485,6 @@ TARGET_DIRS_GGI=1
 TARGET_DIRS_LIBPNG=1
 TARGET_DIRS_LIBGD=1
 TARGET_DIRS_UTMP=1
-TARGET_DIRS_CMEM=1
 TARGET_DIRS_BFD=1
 TARGET_DIRS_ZLIB=1
 TARGET_DIRS_GDBM=1
@@ -2024,49 +2022,6 @@ utmp:
 	$(MAKE) -C utmp all
 .PHONY: utmp_all utmp_debug utmp_smart utmp_release utmp_examples utmp_shared utmp_install utmp_sourceinstall utmp_exampleinstall utmp_distinstall utmp_zipinstall utmp_zipsourceinstall utmp_zipexampleinstall utmp_zipdistinstall utmp_clean utmp_distclean utmp_cleanall utmp_info utmp_makefiles utmp
 endif
-ifdef TARGET_DIRS_CMEM
-cmem_all:
-	$(MAKE) -C cmem all
-cmem_debug:
-	$(MAKE) -C cmem debug
-cmem_smart:
-	$(MAKE) -C cmem smart
-cmem_release:
-	$(MAKE) -C cmem release
-cmem_examples:
-	$(MAKE) -C cmem examples
-cmem_shared:
-	$(MAKE) -C cmem shared
-cmem_install:
-	$(MAKE) -C cmem install
-cmem_sourceinstall:
-	$(MAKE) -C cmem sourceinstall
-cmem_exampleinstall:
-	$(MAKE) -C cmem exampleinstall
-cmem_distinstall:
-	$(MAKE) -C cmem distinstall
-cmem_zipinstall:
-	$(MAKE) -C cmem zipinstall
-cmem_zipsourceinstall:
-	$(MAKE) -C cmem zipsourceinstall
-cmem_zipexampleinstall:
-	$(MAKE) -C cmem zipexampleinstall
-cmem_zipdistinstall:
-	$(MAKE) -C cmem zipdistinstall
-cmem_clean:
-	$(MAKE) -C cmem clean
-cmem_distclean:
-	$(MAKE) -C cmem distclean
-cmem_cleanall:
-	$(MAKE) -C cmem cleanall
-cmem_info:
-	$(MAKE) -C cmem info
-cmem_makefiles:
-	$(MAKE) -C cmem makefiles
-cmem:
-	$(MAKE) -C cmem all
-.PHONY: cmem_all cmem_debug cmem_smart cmem_release cmem_examples cmem_shared cmem_install cmem_sourceinstall cmem_exampleinstall cmem_distinstall cmem_zipinstall cmem_zipsourceinstall cmem_zipexampleinstall cmem_zipdistinstall cmem_clean cmem_distclean cmem_cleanall cmem_info cmem_makefiles cmem
-endif
 ifdef TARGET_DIRS_BFD
 bfd_all:
 	$(MAKE) -C bfd all