rnd-19981202-1

[rocksndiamonds.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index a6ab699696ebb7356b22370b2e205af465a34d1a..26739fb70a26a49c0f5f2a6e7902a33b3cc875d6 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -11,11 +11,10 @@
 CC = gcc
 
 # on Solaris and similar systems, you'll need to uncomment this
-EXTRA_LIBS = -lnsl -lsocket 
+# EXTRA_LIBS = -lnsl -lsocket 
 
-# specify path to X11 on your system
-# X11_PATH = /usr/X11
-X11_PATH = /local/X11
+# specify X11 library path on your system
+XLIB_PATH = /usr/X11/lib
 
 # change this to the directory where you want to install game data like levels
 GAME_DIR = .
@@ -45,7 +44,7 @@ SCORE_ENTRIES = MANY_PER_NAME
 # you shouldn't need to change anything below                                 #
 #-----------------------------------------------------------------------------#
 
-PROGNAME = rocksndiamonds
+PROGNAME = ../rocksndiamonds
 
 RM = rm -f
 CPP = $(CC) -E
@@ -73,12 +72,7 @@ DEBUG = -DDEBUG -g -Wall
 # LIBS = -L/usr/X11R6/lib -lX11 -lm
 
 # LIBS = -L/usr/X11R6/lib $(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)
+LIBS = -L$(XLIB_PATH) $(EXTRA_X11_LIBS) -lX11 -lm $(EXTRA_LIBS)
 
 # CFLAGS = -O2 $(CONFIG) $(SYSTEM)
 CFLAGS = $(DEBUG) $(CONFIG) $(SYSTEM) $(INCL)
@@ -101,7 +95,8 @@ SRCS =       main.c          \
        pcx.c           \
        image.c         \
        network.c       \
-       netserv.c
+       netserv.c       \
+       msdos.c
 
 OBJS = main.o          \
        init.o          \
@@ -121,7 +116,8 @@ OBJS =      main.o          \
        pcx.o           \
        image.o         \
        network.o       \
-       netserv.o
+       netserv.o       \
+       msdos.o
 
 all:   $(PROGNAME)
 
@@ -132,7 +128,12 @@ $(PROGNAME):       $(OBJS)
        $(CC) $(CFLAGS) -c $*.c
 
 clean:
-       $(RM) $(PROGNAME) $(SERVNAME) $(OBJS)
+       $(RM) *.o
+       $(RM) $(PROGNAME)
+
+depend:
+       for i in $(SRCS); do $(CPP) $(CFLAGS) -M $$i; done > .depend
 
-backup:
-       ./make_backup.sh
+ifeq (.depend,$(wildcard .depend))
+include .depend
+endif