Add xraw library option.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@2812 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor 1998-06-17 14:50:36 +00:00
parent 3d4e242bab
commit 137f201e8f
4 changed files with 34 additions and 2 deletions

View file

@ -1,3 +1,10 @@
Wed Jun 17 10:00:20 1998 Adam Fedor <fedor@ultra.doc.com>
* brain.make: Add xraw library combo option
* library.make: Add --no-keep-going MAKE option.
* tool.make: Likewise.
Fri Jun 12 22:15:00 1998 Richard Frith-Macdonald <richard@brainstorm.co.uk>
* which_lib.c Fixed generation of library suffix and logic for shared

View file

@ -33,6 +33,14 @@ ifeq ($(library_combo),fd-xdps)
the_library_combo=gnu-fd-gnu-xdps
endif
ifeq ($(library_combo),gnu-xraw)
the_library_combo=gnu-gnu-gnu-xraw
endif
ifeq ($(library_combo),fd-xraw)
the_library_combo=gnu-fd-gnu-xraw
endif
ifeq ($(the_library_combo),)
the_library_combo=$(library_combo)
endif
@ -171,6 +179,12 @@ BACKEND_LIBS = -lgnustep-xdps
BACKEND_DEFINE = -DXDPS_BACKEND_LIBRARY=1
endif
ifeq ($(GUI_BACKEND_LIB),xraw)
BACKEND_LDFLAGS =
BACKEND_LIBS = -lgnustep-xraw
BACKEND_DEFINE = -DXRAW_BACKEND_LIBRARY=1
endif
ifeq ($(GUI_BACKEND_LIB),w32)
BACKEND_LDFLAGS =
BACKEND_LIBS = -lMBKit
@ -191,6 +205,17 @@ SYSTEM_LIB_DIR = $(X_LIBS)
SYSTEM_LIBS = -ltiff -ldpstk -ldps -lpsres -lX11
endif
#
# If the backend GUI library is X (only) based
# then add X headers and libraries
#
ifeq ($(GUI_BACKEND_LIB),xraw)
SYSTEM_INCLUDES = $(X_INCLUDE)
SYSTEM_LDFLAGS =
SYSTEM_LIB_DIR = $(X_LIBS)
SYSTEM_LIBS = -ltiff -lpsres -lX11
endif
#
# If the backend GUI library is Win32 based
# then add Win32 headers and libraries

View file

@ -56,7 +56,7 @@ internal-clean:: $(LIBRARY_NAME:=.clean.library.variables)
internal-distclean:: $(LIBRARY_NAME:=.distclean.library.variables)
$(LIBRARY_NAME):
@$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory \
@$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going \
$@.all.library.variables
else

View file

@ -54,7 +54,7 @@ internal-clean:: $(TOOL_NAME:=.clean.tool.variables)
internal-distclean:: $(TOOL_NAME:=.distclean.tool.variables)
$(TOOL_NAME):
@$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory $@.all.tool.variables
@$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going $@.all.tool.variables
else