rnd-19981010-1

[rocksndiamonds.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index bff1b9b4ba6019e45a52d591cd16995350da1c46..a4f457184d4650ced6823c1def1eba22d1ec9b2a 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -3,7 +3,7 @@
 #
 
 PROGNAME = rocksndiamonds
-SERVNAME = rnd_server
+# SERVNAME = rnd_server
 
 RM = rm -f
 CC = gcc
@@ -23,6 +23,7 @@ SCORE_ENTRIES = -DMANY_PER_NAME               # many score entries per name
 # files (and the mask files ('*Maske.gif') to xbm files).
 
 # XPM_INCLUDE_FILE = -DXPM_INCLUDE_FILE="<X11/xpm.h>"
+# EXTRA_X11_LIBS = -lXpm
 
 CONFIG = $(GAME_DIR) $(SOUNDS) $(JOYSTICK)     \
         $(SCORE_ENTRIES) $(XPM_INCLUDE_FILE)
@@ -41,7 +42,9 @@ DEBUG = -DDEBUG -g -Wall
 #                                      # for SunOS and others
 
 # LIBS = -L/usr/X11R6/lib -lXpm -lX11 -lm
-LIBS = -L/usr/X11R6/lib -lX11 -lm
+# LIBS = -L/usr/X11R6/lib -lX11 -lm
+
+LIBS = -L/usr/X11R6/lib $(EXTRA_X11_LIBS) -lX11 -lm
 
 # CFLAGS = -O2 $(CONFIG) $(SYSTEM)
 CFLAGS = $(DEBUG) $(CONFIG) $(SYSTEM) $(INCL)
@@ -60,12 +63,13 @@ SRCS =      main.c          \
        sound.c         \
        joystick.c      \
        cartoons.c      \
-       gfxload.c       \
+       random.c        \
        gifload.c       \
        gif.c           \
        send.c          \
        new.c           \
-       random.c
+       network.c       \
+       netserv.c
 
 OBJS = main.o          \
        init.o          \
@@ -81,20 +85,22 @@ OBJS =      main.o          \
        sound.o         \
        joystick.o      \
        cartoons.o      \
-       gfxload.o       \
+       random.o        \
        gifload.o       \
        gif.o           \
        send.o          \
        new.o           \
-       random.o
+       network.o       \
+       netserv.o
 
-all:   $(PROGNAME) $(SERVNAME)
+# all: $(PROGNAME) $(SERVNAME)
+all:   $(PROGNAME)
 
 $(PROGNAME):   $(OBJS)
        $(CC) $(CFLAGS) $(OBJS) $(LIBS) -o $(PROGNAME)
 
-$(SERVNAME):   $(SERVNAME).c
-       $(CC) $(CFLAGS) $(SERVNAME).c $(LIBS) -o $(SERVNAME)
+# $(SERVNAME): $(SERVNAME).c
+#      $(CC) $(CFLAGS) $(SERVNAME).c $(LIBS) -o $(SERVNAME)
 
 .c.o:
        $(CC) $(CFLAGS) -c $*.c