[Pkg-nethack-devel] nethack/patches 05_makefile_logic.dpatch,NONE,1.1 00list,1.14,1.15 05_build_cflags.dpatch,1.1,NONE
Joshua Kwan
joshk-guest@quantz.debian.org
Mon, 22 Dec 2003 09:49:23 +0000
Update of /cvsroot/pkg-nethack/nethack/patches
In directory quantz:/tmp/cvs-serv30908/patches
Modified Files:
00list
Added Files:
05_makefile_logic.dpatch
Removed Files:
05_build_cflags.dpatch
Log Message:
More build system unclutterage. thanks in part to aaronl
--- 05_build_cflags.dpatch DELETED ---
Index: 00list
===================================================================
RCS file: /cvsroot/pkg-nethack/nethack/patches/00list,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- 00list 12 Dec 2003 03:59:55 -0000 1.14
+++ 00list 22 Dec 2003 09:49:21 -0000 1.15
@@ -1,7 +1,7 @@
01_fix_qt
02_SECURITY_recover_secure
04_manpage_paths
-05_build_cflags
+05_makefile_logic
06_x11_data
08_linux_specifics
09_use_gnu_source
--- NEW FILE: 05_makefile_logic.dpatch ---
#! /bin/sh -e
## 05_makefile_logic.dpatch by Aaron Lehmann <aaronl@vitelus.com>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Move some of the logical burden to make
if [ $# -ne 1 ]; then
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
exit 1
fi
case "$1" in
-patch) patch -f --no-backup-if-mismatch -p1 < $0;;
-unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
*)
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
exit 1;;
esac
exit 0
--- nethack-3.4.3/sys/unix/Makefile.src 2003-12-22 01:33:34.000000000 -0800
+++ nethack-3.4.3/sys/unix/Makefile.src~ 2003-12-22 01:32:43.000000000 -0800
@@ -125,7 +125,7 @@
# flags for Linux
# compile normally
# CFLAGS = -O2 -fomit-frame-pointer -I../include
-LFLAGS = -L/usr/X11R6/lib
+# LFLAGS = -L/usr/X11R6/lib
# OR compile backwards compatible a.out format
# CFLAGS = -O2 -b i486-linuxaout -fomit-frame-pointer -I../include
# LFLAGS = -b i486-linuxaout -L/usr/X11R6/lib
@@ -146,16 +146,18 @@
# directories. The ones given below is the usual spot for linux systems.
# The paths are for glibconfig.h and gnomesupport.h respectively.
#
-GNOMEINC=$(shell gnome-config --cflags gnomeui)
+GNOMEINC=-I/usr/lib/glib/include -I/usr/lib/gnome-libs/include -I../win/gnome
# flags for debugging:
# CFLAGS = -g -I../include
+CFLAGS = -O -I../include
+LFLAGS =
+
# The Qt and Be window systems are written in C++, while the rest of
# NetHack is standard C. If using Qt, uncomment the LINK line here to get
# the C++ libraries linked in.
-QTDIR = /usr
-CXXFLAGS = $(CFLAGS) -I. -I$(QTDIR)/include/qt3
+CXXFLAGS = $(CFLAGS) -I. -I$(QTDIR)/include
CXX=g++
#LINK=g++
# For cross-compiling, eg. with gcc on Linux (see also CC further up):
@@ -210,41 +212,10 @@
# ../win/BeOS/NHMenuWindow.cpp ../win/BeOS/NHMapWindow.cpp tile.c
#WINBEOBJ = winbe.o NHWindow.o NHMenuWindow.o NHMapWindow.o tile.o
-# Files for the lisp port
-WINLISPSRC = ../win/lisp/winlisp.c tile.c
-WINLISPOBJ = winlisp.o tile.o
-
#
#
-ifeq ($(WIN),tty)
- WINSRC = $(WINTTYSRC)
- WINOBJ = $(WINTTYOBJ)
- WINLIB = $(WINTTYLIB)
-endif
-ifeq ($(WIN),x11)
- WINSRC = $(WINTTYSRC) $(WINX11SRC)
- WINOBJ = $(WINTTYOBJ) $(WINX11OBJ)
- WINLIB = $(WINTTYLIB) $(WINX11LIB)
- CFLAGS += -I/usr/X11R6/include -DX11_GRAPHICS
-endif
-ifeq ($(WIN),gnome)
- WINSRC = $(WINTTYSRC) $(WINGNOMESRC)
- WINOBJ = $(WINTTYOBJ) $(WINGNOMEOBJ)
- WINLIB = $(WINTTYLIB) $(WINGNOMELIB)
- CFLAGS += -DGNOME_GRAPHICS
-endif
-ifeq ($(WIN),qt)
- WINSRC = $(WINTTYSRC) $(WINQTSRC)
- WINOBJ = $(WINTTYOBJ) $(WINQTOBJ)
- WINLIB = $(WINTTYLIB) $(WINQTLIB)
- CFLAGS += -DQT_GRAPHICS
-endif
-ifeq ($(WIN),lisp)
- WINSRC = $(WINLISPSRC)
- WINOBJ = $(WINLISPOBJ)
- WINLIB = $(WINLISPLIB)
- CFLAGS += -DLISP_GRAPHICS -DDEFAULT_WINDOW_SYS=\"lisp\"
-endif
+WINSRC = $(WINTTYSRC)
+WINOBJ = $(WINTTYOBJ)
# on some systems the termcap library is in -ltermcap or -lcurses
# on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead
@@ -259,24 +230,24 @@
# WINTTYLIB = -ltermcap
# WINTTYLIB = -lcurses
# WINTTYLIB = -lcurses16
-WINTTYLIB = -lncurses
-# WINTTYLIB = -ltermlib
+# WINTTYLIB = -lncurses
+WINTTYLIB = -ltermlib
#
# libraries for X11
# If USE_XPM is defined in config.h, you will also need -lXpm here.
-WINX11LIB = -lXaw -lXmu -lXext -lXt -lXpm -lX11 -lm
+WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11
# WINX11LIB = -lXaw -lXmu -lXt -lX11
# WINX11LIB = -lXaw -lXmu -lXext -lXt -lXpm -lX11 -lm
# WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0
#
# libraries for Qt
-WINQTLIB = -L$(QTDIR)/lib -lqt-mt
+WINQTLIB = -L$(QTDIR)/lib -lqt
#
# libraries for KDE (with Qt)
WINKDELIB = -lkdecore -lkdeui -lXext
#
# libraries for Gnome
-WINGNOMELIB = $(shell gnome-config --libs gnomeui)
+WINGNOMELIB = -lgnomeui -lgnome -lart_lgpl -lgtk -lgdk -lpopt
#
# libraries for Gem port
WINGEMLIB = -le_gem -lgem
@@ -284,6 +255,8 @@
# libraries for BeOS
WINBELIB = -lbe
+WINLIB = $(WINTTYLIB)
+
# any other strange libraries your system needs (for Sysunix only -- the more
# specialized targets should already be right)
#
@@ -365,7 +338,7 @@
GENCSRC = monstr.c vis_tab.c #tile.c
# all windowing-system-dependent .c (for dependencies and such)
-WINCSRC = $(WINTTYSRC) $(WINX11SRC) $(WINGNOMESRC) $(WINGEMSRC) $(WINLISPSRC)
+WINCSRC = $(WINTTYSRC) $(WINX11SRC) $(WINGNOMESRC) $(WINGEMSRC)
# all windowing-system-dependent .cpp (for dependencies and such)
WINCXXSRC = $(WINQTSRC) $(WINBESRC)
@@ -710,9 +683,6 @@
$(CC) $(CFLAGS) -c ../win/gem/load_img.c
gr_rect.o: ../win/gem/gr_rect.c ../include/gr_rect.h
$(CC) $(CFLAGS) -c ../win/gem/gr_rect.c
-winlisp.o: ../win/lisp/winlisp.c $(HACK_H) ../include/winlisp.h \
- ../include/func_tab.h ../include/dlb.h ../include/patchlevel.h
- $(CC) $(CFLAGS) -c ../win/lisp/winlisp.c
tile.o: tile.c $(HACK_H)
qt_win.o: ../win/Qt/qt_win.cpp $(HACK_H) ../include/func_tab.h \
../include/dlb.h ../include/patchlevel.h ../include/tile2x11.h \
@@ -833,8 +803,7 @@
weapon.o: weapon.c $(HACK_H)
were.o: were.c $(HACK_H)
wield.o: wield.c $(HACK_H)
-windows.o: windows.c $(HACK_H) ../include/wingem.h ../include/winGnome.h \
- ../include/winlisp.h
+windows.o: windows.c $(HACK_H) ../include/wingem.h ../include/winGnome.h
wizard.o: wizard.c $(HACK_H) ../include/qtext.h ../include/epri.h
worm.o: worm.c $(HACK_H) ../include/lev.h
worn.o: worn.c $(HACK_H)