mirror of
https://github.com/gnustep/libs-gsweb.git
synced 2025-02-19 10:01:05 +00:00
* gsweb.make.in: Remove GSANTLR dependency.
* GSWExtensions.framework/Makefile.preamble: Ditto. * GSWExtensionsGSW.framework/Makefile.preamble: Ditto. * GSWeb.framework/Makefile.preamble.in: Move AUX_LIBS to the bottom so that the linker on Darwin can deal with the static library. * GSWExtensions.framework/GSWKeyValueConditional.h: Remove include currently redundant for the include mechanism and causing warnings to gswnames=wo. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@19106 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
8706ef4cdd
commit
6094776767
6 changed files with 20 additions and 5 deletions
14
ChangeLog
14
ChangeLog
|
@ -1,3 +1,17 @@
|
|||
2004-04-14 David Ayers <d.ayers@inode.at>
|
||||
|
||||
* gsweb.make.in: Remove GSANTLR dependency.
|
||||
* GSWExtensions.framework/Makefile.preamble: Ditto.
|
||||
* GSWExtensionsGSW.framework/Makefile.preamble: Ditto.
|
||||
|
||||
* GSWeb.framework/Makefile.preamble.in: Move AUX_LIBS to the
|
||||
bottom so that the linker on Darwin can deal with the static
|
||||
library.
|
||||
|
||||
* GSWExtensions.framework/GSWKeyValueConditional.h: Remove
|
||||
include currently redundant for the include mechanism and
|
||||
causing warnings to gswnames=wo.
|
||||
|
||||
2004-04-06 Manuel Guesdon <mguesdon@orange-concept.com>
|
||||
|
||||
* GSWeb.framework/GSWHTMLRawParser.m:
|
||||
|
|
|
@ -32,7 +32,6 @@
|
|||
#ifndef _GSWKeyValueConditional_h__
|
||||
#define _GSWKeyValueConditional_h__
|
||||
|
||||
#include <GSWeb/GSWComponent.h>
|
||||
|
||||
//==============================================================================
|
||||
@interface GSWKeyValueConditional : GSWComponent
|
||||
|
|
|
@ -69,7 +69,7 @@ ADDITIONAL_LDFLAGS =
|
|||
# These variables should only be needed on windows
|
||||
# but they aren't set yet.
|
||||
|
||||
LIBRARIES_DEPEND_UPON += -lGSANTLR
|
||||
LIBRARIES_DEPEND_UPON +=
|
||||
|
||||
ifneq ($(FOUNDATION_LIB),gnu)
|
||||
LIBRARIES_DEPEND_UPON += -lgnustep-baseadd
|
||||
|
|
|
@ -83,7 +83,7 @@ WOExtensionsGSW_LIB_DIRS = \
|
|||
-L$(WO_LIBRARY_BASE)/$(GSW_FRAMEWORK_SUFFIX)
|
||||
endif
|
||||
|
||||
LIBRARIES_DEPEND_UPON += -lGSANTLR
|
||||
LIBRARIES_DEPEND_UPON +=
|
||||
|
||||
ifneq ($(FOUNDATION_LIB),gnu)
|
||||
LIBRARIES_DEPEND_UPON += -lgnustep-baseadd
|
||||
|
|
|
@ -64,7 +64,6 @@ ADDITIONAL_CFLAGS = -DUSE_BUILTIN
|
|||
ADDITIONAL_INCLUDE_DIRS = -I./$(GNUSTEP_TARGET_DIR) @XML_CFLAGS@
|
||||
|
||||
# Additional LDFLAGS to pass to the linker
|
||||
LIBRARIES_DEPEND_UPON += @AUX_LIBS@
|
||||
ifneq ($(FOUNDATION_LIB),gnu)
|
||||
LIBRARIES_DEPEND_UPON += -lgnustep-baseadd
|
||||
endif
|
||||
|
@ -73,6 +72,9 @@ LIBRARIES_DEPEND_UPON += \
|
|||
-l$(EOCONTROL_LIBRARY_NAME) \
|
||||
-l$(EOACCESS_LIBRARY_NAME)
|
||||
endif
|
||||
# This entry is last so that -lwrap (libwrap.a static library) will not
|
||||
# be the first entry (which causes problems with the Darwin linker).
|
||||
LIBRARIES_DEPEND_UPON += @AUX_LIBS@
|
||||
|
||||
# Additional library directories the linker should search
|
||||
ADDITIONAL_LIB_DIRS =
|
||||
|
|
|
@ -36,7 +36,7 @@ endif
|
|||
|
||||
|
||||
AUXILIARY_INCLUDE_DIRS += @AUX_INCS@
|
||||
AUXILIARY_TOOL_LIBS += @AUX_LIBS@ -lGSANTLR
|
||||
AUXILIARY_TOOL_LIBS += @AUX_LIBS@
|
||||
|
||||
GDL2=@GDL2@
|
||||
ifeq ($(GDL2),yes)
|
||||
|
|
Loading…
Reference in a new issue