+ Added zlib directory for linux

This commit is contained in:
michael 1999-12-01 09:56:07 +00:00
parent 8633baaf1d
commit 82fd1d3b09
2 changed files with 12 additions and 8 deletions

View File

@ -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
@ -133,7 +133,7 @@ endif
override DIROBJECTS+=$(wildcard ibase mysql uncgi paszlib gdbint api fv)
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
ifeq ($(OS_TARGET),win32)
override DIROBJECTS+=$(wildcard gtk opengl)
@ -154,6 +154,9 @@ ZIPTARGET=install
ifndef PACKAGEDIR
PACKAGEDIR=$(FPCDIR)/packages
endif
ifndef COMPONENTDIR
COMPONENTDIR=$(FPCDIR)/components
endif
# Packages
@ -201,15 +204,15 @@ info: $(addsuffix _info,$(DIROBJECTS))
# Package depends
#####################################################################
ifneq ($(wildcard $(RTLDIR)/$(OS_TARGET)),)
ifeq ($(wildcard $(RTLDIR)/$(OS_TARGET)/$(FPCMAKED)),)
ifneq ($(wildcard $(RTLDIR)),)
ifeq ($(wildcard $(RTLDIR)/$(FPCMAKED)),)
override COMPILEPACKAGES+=rtl
rtl_package:
$(MAKE) -C $(RTLDIR)/$(OS_TARGET) all
$(MAKE) -C $(RTLDIR) all
endif
endif
.PHONY: $(OS_TARGET)_package
.PHONY: rtl_package
# Target Dirs
@ -231,6 +234,7 @@ OBJECTDIRNCURSES=1
OBJECTDIRFORMS=1
OBJECTDIRSVGALIB=1
OBJECTDIRGGI=1
OBJECTDIRZLIB=1
endif
ifeq ($(OS_TARGET),win32)
OBJECTDIRGTK=1

View File

@ -3,8 +3,8 @@
#
[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
[sections]