Browse Source

+ Added zlib directory for linux

michael 26 years ago
parent
commit
82fd1d3b09
2 changed files with 12 additions and 8 deletions
  1. 10 6
      packages/Makefile
  2. 2 2
      packages/Makefile.fpc

+ 10 - 6
packages/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-11-25 20:05
+# Makefile generated by fpcmake v0.99.13 on 1999/12/01 10:45
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -133,7 +133,7 @@ endif
 
 
 override DIROBJECTS+=$(wildcard ibase mysql uncgi paszlib gdbint api fv)
 override DIROBJECTS+=$(wildcard ibase mysql uncgi paszlib gdbint api fv)
 ifeq ($(OS_TARGET),linux)
 ifeq ($(OS_TARGET),linux)
-override DIROBJECTS+=$(wildcard gtk opengl utmp inet postgres ncurses forms svgalib ggi)
+override DIROBJECTS+=$(wildcard gtk opengl utmp inet postgres ncurses forms svgalib ggi zlib)
 endif
 endif
 ifeq ($(OS_TARGET),win32)
 ifeq ($(OS_TARGET),win32)
 override DIROBJECTS+=$(wildcard gtk opengl)
 override DIROBJECTS+=$(wildcard gtk opengl)
@@ -154,6 +154,9 @@ ZIPTARGET=install
 ifndef PACKAGEDIR
 ifndef PACKAGEDIR
 PACKAGEDIR=$(FPCDIR)/packages
 PACKAGEDIR=$(FPCDIR)/packages
 endif
 endif
+ifndef COMPONENTDIR
+COMPONENTDIR=$(FPCDIR)/components
+endif
 
 
 # Packages
 # Packages
 
 
@@ -201,15 +204,15 @@ info: $(addsuffix _info,$(DIROBJECTS))
 # Package depends
 # Package depends
 #####################################################################
 #####################################################################
 
 
-ifneq ($(wildcard $(RTLDIR)/$(OS_TARGET)),)
-ifeq ($(wildcard $(RTLDIR)/$(OS_TARGET)/$(FPCMAKED)),)
+ifneq ($(wildcard $(RTLDIR)),)
+ifeq ($(wildcard $(RTLDIR)/$(FPCMAKED)),)
 override COMPILEPACKAGES+=rtl
 override COMPILEPACKAGES+=rtl
 rtl_package:
 rtl_package:
-	$(MAKE) -C $(RTLDIR)/$(OS_TARGET) all
+	$(MAKE) -C $(RTLDIR) all
 endif
 endif
 endif
 endif
 
 
-.PHONY:  $(OS_TARGET)_package
+.PHONY:  rtl_package
 
 
 
 
 # Target Dirs
 # Target Dirs
@@ -231,6 +234,7 @@ OBJECTDIRNCURSES=1
 OBJECTDIRFORMS=1
 OBJECTDIRFORMS=1
 OBJECTDIRSVGALIB=1
 OBJECTDIRSVGALIB=1
 OBJECTDIRGGI=1
 OBJECTDIRGGI=1
+OBJECTDIRZLIB=1
 endif
 endif
 ifeq ($(OS_TARGET),win32)
 ifeq ($(OS_TARGET),win32)
 OBJECTDIRGTK=1
 OBJECTDIRGTK=1

+ 2 - 2
packages/Makefile.fpc

@@ -3,8 +3,8 @@
 #
 #
 
 
 [targets]
 [targets]
-dirs=ibase mysql uncgi paszlib gdbint api fv
-dirs_linux=gtk opengl utmp inet postgres ncurses forms svgalib ggi
+dirs=ibase mysql uncgi paszlib gdbint api fv 
+dirs_linux=gtk opengl utmp inet postgres ncurses forms svgalib ggi zlib
 dirs_win32=gtk opengl
 dirs_win32=gtk opengl
 
 
 [sections]
 [sections]