rnd-19981113-2

[rocksndiamonds.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index ca65fea56a955dc5b7586d46d146b08578a5267c..a6ab699696ebb7356b22370b2e205af465a34d1a 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -11,10 +11,11 @@
 CC = gcc
 
 # on Solaris and similar systems, you'll need to uncomment this
-# EXTRA_LIBS = -lnsl -lsocket 
+EXTRA_LIBS = -lnsl -lsocket 
 
-# specify X11 library path on your system
-XLIB_PATH = /usr/X11/lib
+# specify path to X11 on your system
+# X11_PATH = /usr/X11
+X11_PATH = /local/X11
 
 # change this to the directory where you want to install game data like levels
 GAME_DIR = .
@@ -72,7 +73,12 @@ DEBUG = -DDEBUG -g -Wall
 # LIBS = -L/usr/X11R6/lib -lX11 -lm
 
 # LIBS = -L/usr/X11R6/lib $(EXTRA_X11_LIBS) -lX11 -lm $(EXTRA_LIBS)
-LIBS = -L$(XLIB_PATH) $(EXTRA_X11_LIBS) -lX11 -lm $(EXTRA_LIBS)
+
+XINC_PATH = $(X11_PATH)/include
+XLIB_PATH = $(X11_PATH)/lib
+
+INCL = -I$(XINC_PATH)
+LIBS = -L$(XLIB_PATH) $(EXTRA_X11_LIBS) -lX11 -lm $(EXTRA_LIBS) -R$(XLIB_PATH)
 
 # CFLAGS = -O2 $(CONFIG) $(SYSTEM)
 CFLAGS = $(DEBUG) $(CONFIG) $(SYSTEM) $(INCL)
@@ -92,10 +98,8 @@ SRCS =       main.c          \
        joystick.c      \
        cartoons.c      \
        random.c        \
-       gifload.c       \
-       gif.c           \
+       pcx.c           \
        image.c         \
-       new.c           \
        network.c       \
        netserv.c
 
@@ -114,10 +118,8 @@ OBJS =     main.o          \
        joystick.o      \
        cartoons.o      \
        random.o        \
-       gifload.o       \
-       gif.o           \
+       pcx.o           \
        image.o         \
-       new.o           \
        network.o       \
        netserv.o
 
@@ -134,10 +136,3 @@ clean:
 
 backup:
        ./make_backup.sh
-
-depend:
-       for i in $(SRCS); do $(CPP) $(CFLAGS) -M $$i; done > .depend
-
-ifeq (.depend,$(wildcard .depend))
-include .depend
-endif