X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2FMakefile;h=a4f457184d4650ced6823c1def1eba22d1ec9b2a;hb=a3e03699f98cea96701f985296056f6974d9305c;hp=f390e365d2690e662662cb0aa307bf6a3b503731;hpb=3abeab753b05c534b4061ad20a1de50a39da6daa;p=rocksndiamonds.git

diff --git a/src/Makefile b/src/Makefile
index f390e365..a4f45718 100644
--- 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)
@@ -61,12 +64,12 @@ SRCS =	main.c		\
 	joystick.c	\
 	cartoons.c	\
 	random.c	\
-	gfxload.c	\
 	gifload.c	\
 	gif.c		\
 	send.c		\
 	new.c		\
-	network.c
+	network.c	\
+	netserv.c
 
 OBJS =	main.o		\
 	init.o		\
@@ -83,20 +86,21 @@ OBJS =	main.o		\
 	joystick.o	\
 	cartoons.o	\
 	random.o	\
-	gfxload.o	\
 	gifload.o	\
 	gif.o		\
 	send.o		\
 	new.o		\
-	network.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