Jelajahi Sumber

* unzip cannot be built on systems with no CRT unit (BeOS, Solaris)

carl 23 tahun lalu
induk
melakukan
a464709aa3
2 mengubah file dengan 19 tambahan dan 16 penghapusan
  1. 13 9
      packages/extra/Makefile
  2. 6 7
      packages/extra/Makefile.fpc

+ 13 - 9
packages/extra/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/04]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -179,24 +179,23 @@ else
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
-override TARGET_DIRS+=unzip
 ifeq ($(OS_TARGET),linux)
-override TARGET_DIRS+=uncgi fpasync x11 opengl gtk syslog forms svgalib ggi libpng libgd utmp cmem bfd zlib gdbm ncurses
+override TARGET_DIRS+=unzip uncgi fpasync x11 opengl gtk syslog forms svgalib ggi libpng libgd utmp cmem bfd zlib gdbm ncurses
 endif
 ifeq ($(OS_TARGET),go32v2)
-override TARGET_DIRS+=uncgi
+override TARGET_DIRS+=unzip uncgi
 endif
 ifeq ($(OS_TARGET),win32)
-override TARGET_DIRS+=uncgi opengl gtk zlib mmsystem
+override TARGET_DIRS+=unzip uncgi opengl gtk zlib mmsystem
 endif
 ifeq ($(OS_TARGET),os2)
-override TARGET_DIRS+=uncgi
+override TARGET_DIRS+=unzip uncgi
 endif
 ifeq ($(OS_TARGET),freebsd)
-override TARGET_DIRS+=uncgi fpasync x11 opengl gtk syslog forms svgalib ggi libpng libgd utmp cmem bfd zlib gdbm ncurses
+override TARGET_DIRS+=unzip uncgi fpasync x11 opengl gtk syslog forms svgalib ggi libpng libgd utmp cmem bfd zlib gdbm ncurses
 endif
 ifeq ($(OS_TARGET),netbsd)
-override TARGET_DIRS+=uncgi fpasync x11 opengl gtk syslog forms svgalib ggi libpng libgd utmp cmem bfd zlib gdbm ncurses
+override TARGET_DIRS+=unzip uncgi fpasync x11 opengl gtk syslog forms svgalib ggi libpng libgd utmp cmem bfd zlib gdbm ncurses
 endif
 override INSTALL_FPCPACKAGE=y
 ifdef REQUIRE_UNITSDIR
@@ -972,8 +971,8 @@ endif
 fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS))
 fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2
 fpc_makefiles: fpc_makefile fpc_makefile_dirs
-TARGET_DIRS_UNZIP=1
 ifeq ($(OS_TARGET),linux)
+TARGET_DIRS_UNZIP=1
 TARGET_DIRS_UNCGI=1
 TARGET_DIRS_FPASYNC=1
 TARGET_DIRS_X11=1
@@ -993,9 +992,11 @@ TARGET_DIRS_GDBM=1
 TARGET_DIRS_NCURSES=1
 endif
 ifeq ($(OS_TARGET),go32v2)
+TARGET_DIRS_UNZIP=1
 TARGET_DIRS_UNCGI=1
 endif
 ifeq ($(OS_TARGET),win32)
+TARGET_DIRS_UNZIP=1
 TARGET_DIRS_UNCGI=1
 TARGET_DIRS_OPENGL=1
 TARGET_DIRS_GTK=1
@@ -1003,9 +1004,11 @@ TARGET_DIRS_ZLIB=1
 TARGET_DIRS_MMSYSTEM=1
 endif
 ifeq ($(OS_TARGET),os2)
+TARGET_DIRS_UNZIP=1
 TARGET_DIRS_UNCGI=1
 endif
 ifeq ($(OS_TARGET),freebsd)
+TARGET_DIRS_UNZIP=1
 TARGET_DIRS_UNCGI=1
 TARGET_DIRS_FPASYNC=1
 TARGET_DIRS_X11=1
@@ -1025,6 +1028,7 @@ TARGET_DIRS_GDBM=1
 TARGET_DIRS_NCURSES=1
 endif
 ifeq ($(OS_TARGET),netbsd)
+TARGET_DIRS_UNZIP=1
 TARGET_DIRS_UNCGI=1
 TARGET_DIRS_FPASYNC=1
 TARGET_DIRS_X11=1

+ 6 - 7
packages/extra/Makefile.fpc

@@ -3,23 +3,22 @@
 #
 
 [target]
-dirs=unzip
-dirs_linux=uncgi fpasync \
+dirs_linux=unzip uncgi fpasync \
            x11 opengl gtk syslog \
            forms svgalib ggi libpng libgd \
            utmp cmem bfd zlib gdbm ncurses
-dirs_netbsd=uncgi fpasync \
+dirs_netbsd=unzip uncgi fpasync \
             x11 opengl gtk syslog \
             forms svgalib ggi libpng libgd \
             utmp cmem bfd zlib gdbm ncurses
-dirs_freebsd=uncgi fpasync \
+dirs_freebsd=unzip uncgi fpasync \
              x11 opengl gtk syslog \
              forms svgalib ggi libpng libgd \
              utmp cmem bfd zlib gdbm ncurses
-dirs_win32=uncgi opengl gtk \
+dirs_win32=unzip uncgi opengl gtk \
            zlib mmsystem
-dirs_os2=uncgi
-dirs_go32v2=uncgi
+dirs_os2=unzip uncgi
+dirs_go32v2=unzip uncgi
 
 [install]
 fpcpackage=y