Browse Source

* unixutil is i386 only, from Micha Nelissen

git-svn-id: trunk@4519 -
florian 19 năm trước cách đây
mục cha
commit
c7f7813fc9
2 tập tin đã thay đổi với 56 bổ sung61 xóa
  1. 54 60
      packages/extra/Makefile
  2. 2 1
      packages/extra/Makefile.fpc

+ 54 - 60
packages/extra/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/08/02]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/08/30]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-palmos arm-wince arm-gba powerpc64-linux
@@ -231,7 +231,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
 ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses tcl cdrom imlib gnome1 fpgtk unixutil newt uuid
+override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses tcl cdrom imlib gnome1 fpgtk newt uuid unixutil
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
 override TARGET_DIRS+=unzip
@@ -270,7 +270,7 @@ ifeq ($(FULL_TARGET),i386-wince)
 override TARGET_DIRS+=unzip zlib tcl fftw
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses tcl cdrom imlib gnome1 fpgtk unixutil newt uuid
+override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses tcl cdrom imlib gnome1 fpgtk newt uuid
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
 override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses fpgtk tcl imlib gnome1
@@ -288,7 +288,7 @@ ifeq ($(FULL_TARGET),m68k-palmos)
 override TARGET_DIRS+=palmunits
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses tcl cdrom imlib gnome1 fpgtk unixutil newt uuid
+override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses tcl cdrom imlib gnome1 fpgtk newt uuid
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
 override TARGET_DIRS+=unzip zlib x11 opengl gtk syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses fpgtk tcl imlib gnome1
@@ -300,7 +300,7 @@ ifeq ($(FULL_TARGET),powerpc-darwin)
 override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses fpgtk tcl imlib gnome1 univint
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses tcl cdrom imlib gnome1 fpgtk unixutil newt uuid
+override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses tcl cdrom imlib gnome1 fpgtk newt uuid
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_DIRS+=unzip zlib x11 opengl gtk syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses fpgtk tcl imlib gnome1
@@ -309,7 +309,7 @@ ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses fpgtk tcl imlib gnome1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses tcl cdrom imlib gnome1 fpgtk unixutil newt uuid
+override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses tcl cdrom imlib gnome1 fpgtk newt uuid
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
 override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses fpgtk tcl imlib gnome1
@@ -318,7 +318,7 @@ ifeq ($(FULL_TARGET),x86_64-win64)
 override TARGET_DIRS+=unzip opengl gtk gtk2 zlib tcl cdrom fpgtk winunits fftw
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses tcl cdrom imlib gnome1 fpgtk unixutil newt uuid
+override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses tcl cdrom imlib gnome1 fpgtk newt uuid
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
 override TARGET_DIRS+=palmunits
@@ -327,7 +327,7 @@ ifeq ($(FULL_TARGET),arm-wince)
 override TARGET_DIRS+=unzip zlib tcl fftw
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses tcl cdrom imlib gnome1 fpgtk unixutil newt uuid
+override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses tcl cdrom imlib gnome1 fpgtk newt uuid
 endif
 override INSTALL_FPCPACKAGE=y
 override INSTALL_FPCSUBDIR=packages/extra
@@ -1416,9 +1416,9 @@ TARGET_DIRS_CDROM=1
 TARGET_DIRS_IMLIB=1
 TARGET_DIRS_GNOME1=1
 TARGET_DIRS_FPGTK=1
-TARGET_DIRS_UNIXUTIL=1
 TARGET_DIRS_NEWT=1
 TARGET_DIRS_UUID=1
+TARGET_DIRS_UNIXUTIL=1
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
 TARGET_DIRS_UNZIP=1
@@ -1608,7 +1608,6 @@ TARGET_DIRS_CDROM=1
 TARGET_DIRS_IMLIB=1
 TARGET_DIRS_GNOME1=1
 TARGET_DIRS_FPGTK=1
-TARGET_DIRS_UNIXUTIL=1
 TARGET_DIRS_NEWT=1
 TARGET_DIRS_UUID=1
 endif
@@ -1706,7 +1705,6 @@ TARGET_DIRS_CDROM=1
 TARGET_DIRS_IMLIB=1
 TARGET_DIRS_GNOME1=1
 TARGET_DIRS_FPGTK=1
-TARGET_DIRS_UNIXUTIL=1
 TARGET_DIRS_NEWT=1
 TARGET_DIRS_UUID=1
 endif
@@ -1781,7 +1779,6 @@ TARGET_DIRS_CDROM=1
 TARGET_DIRS_IMLIB=1
 TARGET_DIRS_GNOME1=1
 TARGET_DIRS_FPGTK=1
-TARGET_DIRS_UNIXUTIL=1
 TARGET_DIRS_NEWT=1
 TARGET_DIRS_UUID=1
 endif
@@ -1852,7 +1849,6 @@ TARGET_DIRS_CDROM=1
 TARGET_DIRS_IMLIB=1
 TARGET_DIRS_GNOME1=1
 TARGET_DIRS_FPGTK=1
-TARGET_DIRS_UNIXUTIL=1
 TARGET_DIRS_NEWT=1
 TARGET_DIRS_UUID=1
 endif
@@ -1914,7 +1910,6 @@ TARGET_DIRS_CDROM=1
 TARGET_DIRS_IMLIB=1
 TARGET_DIRS_GNOME1=1
 TARGET_DIRS_FPGTK=1
-TARGET_DIRS_UNIXUTIL=1
 TARGET_DIRS_NEWT=1
 TARGET_DIRS_UUID=1
 endif
@@ -1950,7 +1945,6 @@ TARGET_DIRS_CDROM=1
 TARGET_DIRS_IMLIB=1
 TARGET_DIRS_GNOME1=1
 TARGET_DIRS_FPGTK=1
-TARGET_DIRS_UNIXUTIL=1
 TARGET_DIRS_NEWT=1
 TARGET_DIRS_UUID=1
 endif
@@ -2944,51 +2938,6 @@ fpgtk:
 	$(MAKE) -C fpgtk all
 .PHONY: fpgtk_all fpgtk_debug fpgtk_smart fpgtk_release fpgtk_units fpgtk_examples fpgtk_shared fpgtk_install fpgtk_sourceinstall fpgtk_exampleinstall fpgtk_distinstall fpgtk_zipinstall fpgtk_zipsourceinstall fpgtk_zipexampleinstall fpgtk_zipdistinstall fpgtk_clean fpgtk_distclean fpgtk_cleanall fpgtk_info fpgtk_makefiles fpgtk
 endif
-ifdef TARGET_DIRS_UNIXUTIL
-unixutil_all:
-	$(MAKE) -C unixutil all
-unixutil_debug:
-	$(MAKE) -C unixutil debug
-unixutil_smart:
-	$(MAKE) -C unixutil smart
-unixutil_release:
-	$(MAKE) -C unixutil release
-unixutil_units:
-	$(MAKE) -C unixutil units
-unixutil_examples:
-	$(MAKE) -C unixutil examples
-unixutil_shared:
-	$(MAKE) -C unixutil shared
-unixutil_install:
-	$(MAKE) -C unixutil install
-unixutil_sourceinstall:
-	$(MAKE) -C unixutil sourceinstall
-unixutil_exampleinstall:
-	$(MAKE) -C unixutil exampleinstall
-unixutil_distinstall:
-	$(MAKE) -C unixutil distinstall
-unixutil_zipinstall:
-	$(MAKE) -C unixutil zipinstall
-unixutil_zipsourceinstall:
-	$(MAKE) -C unixutil zipsourceinstall
-unixutil_zipexampleinstall:
-	$(MAKE) -C unixutil zipexampleinstall
-unixutil_zipdistinstall:
-	$(MAKE) -C unixutil zipdistinstall
-unixutil_clean:
-	$(MAKE) -C unixutil clean
-unixutil_distclean:
-	$(MAKE) -C unixutil distclean
-unixutil_cleanall:
-	$(MAKE) -C unixutil cleanall
-unixutil_info:
-	$(MAKE) -C unixutil info
-unixutil_makefiles:
-	$(MAKE) -C unixutil makefiles
-unixutil:
-	$(MAKE) -C unixutil all
-.PHONY: unixutil_all unixutil_debug unixutil_smart unixutil_release unixutil_units unixutil_examples unixutil_shared unixutil_install unixutil_sourceinstall unixutil_exampleinstall unixutil_distinstall unixutil_zipinstall unixutil_zipsourceinstall unixutil_zipexampleinstall unixutil_zipdistinstall unixutil_clean unixutil_distclean unixutil_cleanall unixutil_info unixutil_makefiles unixutil
-endif
 ifdef TARGET_DIRS_NEWT
 newt_all:
 	$(MAKE) -C newt all
@@ -3079,6 +3028,51 @@ uuid:
 	$(MAKE) -C uuid all
 .PHONY: uuid_all uuid_debug uuid_smart uuid_release uuid_units uuid_examples uuid_shared uuid_install uuid_sourceinstall uuid_exampleinstall uuid_distinstall uuid_zipinstall uuid_zipsourceinstall uuid_zipexampleinstall uuid_zipdistinstall uuid_clean uuid_distclean uuid_cleanall uuid_info uuid_makefiles uuid
 endif
+ifdef TARGET_DIRS_UNIXUTIL
+unixutil_all:
+	$(MAKE) -C unixutil all
+unixutil_debug:
+	$(MAKE) -C unixutil debug
+unixutil_smart:
+	$(MAKE) -C unixutil smart
+unixutil_release:
+	$(MAKE) -C unixutil release
+unixutil_units:
+	$(MAKE) -C unixutil units
+unixutil_examples:
+	$(MAKE) -C unixutil examples
+unixutil_shared:
+	$(MAKE) -C unixutil shared
+unixutil_install:
+	$(MAKE) -C unixutil install
+unixutil_sourceinstall:
+	$(MAKE) -C unixutil sourceinstall
+unixutil_exampleinstall:
+	$(MAKE) -C unixutil exampleinstall
+unixutil_distinstall:
+	$(MAKE) -C unixutil distinstall
+unixutil_zipinstall:
+	$(MAKE) -C unixutil zipinstall
+unixutil_zipsourceinstall:
+	$(MAKE) -C unixutil zipsourceinstall
+unixutil_zipexampleinstall:
+	$(MAKE) -C unixutil zipexampleinstall
+unixutil_zipdistinstall:
+	$(MAKE) -C unixutil zipdistinstall
+unixutil_clean:
+	$(MAKE) -C unixutil clean
+unixutil_distclean:
+	$(MAKE) -C unixutil distclean
+unixutil_cleanall:
+	$(MAKE) -C unixutil cleanall
+unixutil_info:
+	$(MAKE) -C unixutil info
+unixutil_makefiles:
+	$(MAKE) -C unixutil makefiles
+unixutil:
+	$(MAKE) -C unixutil all
+.PHONY: unixutil_all unixutil_debug unixutil_smart unixutil_release unixutil_units unixutil_examples unixutil_shared unixutil_install unixutil_sourceinstall unixutil_exampleinstall unixutil_distinstall unixutil_zipinstall unixutil_zipsourceinstall unixutil_zipexampleinstall unixutil_zipdistinstall unixutil_clean unixutil_distclean unixutil_cleanall unixutil_info unixutil_makefiles unixutil
+endif
 ifdef TARGET_DIRS_WINUNITS
 winunits_all:
 	$(MAKE) -C winunits all

+ 2 - 1
packages/extra/Makefile.fpc

@@ -6,7 +6,8 @@ dirs_linux=unzip zlib fftw \
            x11 opengl gtk gtk2 syslog \
            forms svgalib ggi libpng libgd \
            utmp bfd gdbm ncurses tcl cdrom \
-           imlib gnome1 fpgtk unixutil newt uuid
+           imlib gnome1 fpgtk newt uuid
+dirs_i386_linux=unixutil
 dirs_netbsd=unzip zlib \
             x11 opengl gtk syslog \
             forms svgalib ggi libpng libgd \