* gsweb.make.in

* Examples/hello/GNUmakefile
	* Examples/hello/Makefile.preamble
	* Testing/DynamicElements/GNUmakefile
	* Testing/DynamicElements/Makefile.preamble: Rely on
	Auxiliary/gdl2.make and Auxiliary/gsweb.make to set compiler and
	linker flags.
	* Examples/hello/config.mak: Removed.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@16852 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
David Ayers 2003-06-01 22:00:18 +00:00
parent a536c0ab84
commit 5232fe00f6
8 changed files with 42 additions and 51 deletions

View file

@ -27,9 +27,12 @@ GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
include ../../config.mak
include $(GNUSTEP_MAKEFILES)/common.make
include config.mak
include $(GNUSTEP_MAKEFILES)/Auxiliary/gsweb.make
ifeq ($(GDL2),yes)
include $(GNUSTEP_MAKEFILES)/Auxiliary/gdl2.make
endif
GSWAPP_NAME=DynamicElements
DynamicElements_HAS_GSWCOMPONENTS=YES

View file

@ -1,3 +1,4 @@
# -*-makefile-*-
# Copyright (C) 2002 Free Software Foundation, Inc.
#
# Written by: Manuel Guesdon <mguesdon@orange-concept.Com>
@ -42,29 +43,13 @@ ADDITIONAL_OBJCFLAGS =
ADDITIONAL_CFLAGS =
# Additional flags to pass to the Objective-C compiler
#new
ifeq ($(GDL2), yes)
ADDITIONAL_OBJCFLAGS = -DUSE_BUILTIN -DGDL2
else
ADDITIONAL_OBJCFLAGS = -DUSE_BUILTIN
endif
ADDITIONAL_OBJCFLAGS = -DUSE_BUILTIN
# Additional include directories the compiler should search
ADDITIONAL_INCLUDE_DIRS = -I$(GNUSTEP_SYSTEM_ROOT)/db -I../..
ADDITIONAL_INCLUDE_DIRS = -I../..
# Additional LDFLAGS to pass to the linker
ifeq ($(debug), yes)
ADDITIONAL_LDFLAGS = -lGSWeb -lGSANTLR_d -lgnustep-db2_d -lgnustep-db2control_d
else
ADDITIONAL_LDFLAGS = -lGSWeb -lGSANTLR -lgnustep-db2 -lgnustep-db2control
endif
ifeq ($(LIBWRAP), yes)
ADDITIONAL_OBJCFLAGS := $(ADDITIONAL_OBJCFLAGS) -DHAVE_LIBWRAP
ADDITIONAL_LDFLAGS := $(ADDITIONAL_LDFLAGS) -lwrap
endif
#-lgnustep-xraw
ADDITIONAL_LDFLAGS =
# Additional library directories the linker should search
ADDITIONAL_LIB_DIRS =