From 1b31f62bebdda93da5911e71b52a24d06bd2e4c7 Mon Sep 17 00:00:00 2001 From: fedor Date: Wed, 3 Apr 2002 18:12:53 +0000 Subject: [PATCH] Fix for compiling as a library git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@13336 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 5 +++++ Source/GNUmakefile.preamble | 23 ++++++++--------------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index d609a53..d725e29 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-04-03 Adam Fedor + + * Source/GNUmakefile.preamble: Fix LIB_DIRS and + LIBRARIES_DEPEND_UPON for compiling as a library. + 2002-04-02 Adam Fedor * Source/gsc/GSContext.m (-GSDefineGState): Use new def - also diff --git a/Source/GNUmakefile.preamble b/Source/GNUmakefile.preamble index 42363cb..fa0d766 100644 --- a/Source/GNUmakefile.preamble +++ b/Source/GNUmakefile.preamble @@ -43,21 +43,14 @@ ADDITIONAL_INCLUDE_DIRS += -I../Headers \ #ADDITIONAL_LDFLAGS += # Additional library directories the linker should search -#ADDITIONAL_LIB_DIRS += - -# -# Flags dealing with installing and uninstalling -# - -# What are the libraries this library depends upon. This is needed for some -# systems where building a shared library requires to pass to the linker -# all the libraries the target library depends upon. - -#LIBRARIES_DEPEND_UPON = - -# Flags for compiling as a bundle -ifneq ($(BACKEND_BUNDLE),) -libgnustep-$(BACKEND_NAME)_BUNDLE_LIBS = $(GRAPHIC_LIBS) ADDITIONAL_LIB_DIRS += $(GRAPHIC_LFLAGS) + +# +# Flags for compiling as a bundle or library (if the system depends +# on having libraries specified). +# +libgnustep-$(BACKEND_NAME)_BUNDLE_LIBS = $(GRAPHIC_LIBS) +ifeq ($(BACKEND_BUNDLE),) +libgnustep-$(BACKEND_NAME)_LIBRARIES_DEPEND_UPON = $(GRAPHIC_LIBS) endif