unofficial version 0.8: chat, code cleanup

[netris.git] / Configure

diff --git a/Configure b/Configure
index 537142f2b52e1c46528b43686905cc60f99a117d..1d0ce1c4795a315efbe621d0f9423f84e952846a 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -137,20 +137,19 @@ fi
 
 rm -f test.c test.o a.out
 
-ORIG_SOURCES="game- curses- shapes- board- util- inet- robot-"
-SOURCES="$ORIG_SOURCES"
-
+SOURCES="game- curses- board- util- inet-"
 SRCS="`echo $SOURCES | sed -e s/-/.c/g`"
 OBJS="`echo $SOURCES | sed -e s/-/.o/g`"
+SSOURCES="server- util-"
+SSRCS="`echo $SSOURCES | sed -e s/-/.c/g`"
+SOBJS="`echo $SSOURCES | sed -e s/-/.o/g`"
 
-DISTFILES="README FAQ COPYING VERSION Configure netris.h sr.c server.c robot_desc"
-DISTFILES="$DISTFILES `echo $ORIG_SOURCES | sed -e s/-/.c/g`"
-
-echo > .depend
+DISTFILES="README FAQ INSTALL COPYING VERSION TODO ChangeLog Configure netris.h"
+DISTFILES="$DISTFILES $SRCS server.c"
 
 echo "Creating Makefile"
-sed -e "s/-LFLAGS-/$LFLAGS/g" -e "s/-SRCS-/$SRCS/g" \
-       -e "s/-OBJS-/$OBJS/g" -e "s/-DISTFILES-/$DISTFILES/g" \
+sed -e "s/-LFLAGS-/$LFLAGS/g" -e "s/-OBJS-/$OBJS/g" \
+       -e "s/-SOBJS-/$SOBJS/g" -e "s/-DISTFILES-/$DISTFILES/g" \
        -e "s/-COPT-/$COPT/g" -e "s/-CEXTRA-/$CEXTRA/g" \
        -e "s/-LEXTRA-/$LEXTRA/g" -e "s/-CC-/$CC/g" \
        << "END" > Makefile
@@ -166,22 +165,19 @@ LFLAGS = -LEXTRA- -LFLAGS-
 CFLAGS = $(CEXTRA) $(COPT)
 
 PROG = netris
+SPROG = netrisserver
 HEADERS = netris.h
-
-SRCS = -SRCS-
 OBJS = -OBJS-
+SOBJS = -SOBJS-
 DISTFILES = -DISTFILES-
 
-all: Makefile config.h proto.h $(PROG) sr server
+all: Makefile config.h $(PROG) $(SPROG)
 
 $(PROG): $(OBJS)
        $(CC) -o $(PROG) $(OBJS) $(LFLAGS) $(CFLAGS)
 
-sr: sr.o
-       $(CC) -o sr sr.o $(LFLAGS) $(CFLAGS)
-
-server: server.o
-               $(CC) -o server server.o $(LFLAGS) $(CFLAGS)
+$(SPROG): $(SOBJS)
+       $(CC) -o $(SPROG) $(SOBJS) $(LFLAGS) $(CFLAGS)
 
 .c.o:
        $(CC) $(CFLAGS) -c $<
@@ -191,22 +187,6 @@ Makefile config.h: Configure
        @echo "Run ./Configure now"
        @false
 
-proto.h: $(SRCS)
-       @touch $@
-       @mv $@ $@.old
-       @cat $(SRCS) | grep '^ExtFunc[  ]' | sed -e 's/)$$/);/' > $@
-       @if diff $@.old $@ > /dev/null 2>&1; then :; else \
-               echo "proto.h changed"; \
-               touch proto.chg; \
-       fi
-       @rm -f $@.old
-
-depend: proto.h $(SRCS)
-       @echo "Checking dependencies"
-       @sed -n -e '1,/make depend #####$$/p' Makefile > Makefile.new
-       @$(CC) -M $(SRCS) | sed -e 's/proto\.h/proto.chg/g' >> Makefile.new
-       @mv -f Makefile.new Makefile
-
 dist: $(DISTFILES)
        @vers=`cat VERSION`; \
        dir="netris-$$vers"; \
@@ -221,12 +201,11 @@ dist: $(DISTFILES)
        tar -cvzof $$dir.tar.gz $$dir
 
 clean:
-       rm -f proto.h proto.chg $(PROG) $(OBJS) test.c a.out sr sr.o server server.o
+       rm -f $(PROG) $(OBJS) $(SPROG) $(SOBJS) a.out
 
 cleandir: clean
-       rm -f .depend Makefile config.h
+       rm -f Makefile config.h
 
-##### DO NOT EDIT OR DELETE THIS LINE, it's needed by make depend #####
 END
 
 echo "Creating config.h"
@@ -256,11 +235,6 @@ if [ "$CURSES_HACK" = "true" ]; then
        echo "#define CURSES_HACK" >> config.h
 fi
 
-echo "Running 'make depend'"
-if make depend; then :; else cat << END; fi
-
-make depend failed, but that's OK unless you're doing development
-END
 cat << END
 
 Now do a 'make'