Date: Tuesday May 1, 2001 @ 21:00 Author: cameron Update of /home/netrek/cvsroot/Vanilla In directory swashbuckler.fortress.real-time.com:/var/tmp/cvs-serv1006 Modified Files: ChangeLog Makefile.in configure configure.in system.mk.in Removed Files: config.h.in patchlevel.h version.h Log Message: Wed May 2 12:34:59 2001 James Cameron <quozl at us.netrek.org> * all: move include files to own directory. Changes were contributed by Benjamin `Quisar' Lerman <quisar at quisar.ambre.net> and verified by me. **************************************** Index: Vanilla/ChangeLog diff -u Vanilla/ChangeLog:1.120 Vanilla/ChangeLog:1.121 --- Vanilla/ChangeLog:1.120 Mon Apr 30 04:34:35 2001 +++ Vanilla/ChangeLog Tue May 1 21:00:18 2001 @@ -1,3 +1,9 @@ +Wed May 2 12:34:59 2001 James Cameron <quozl at us.netrek.org> + + * all: move include files to own directory. Changes were + contributed by Benjamin `Quisar' Lerman <quisar at quisar.ambre.net> + and verified by me. + Sun Apr 29 16:52:47 2001 Benjamin `Quisar' Lerman <quisar at quisar.ambre.net> * configure.in: put back AC_SUBST(INL) so that sysdef is correct. @@ -1268,4 +1274,4 @@ update_sys_defaults in updateMessages to a more appropriate location - updateClient in socket.c. - $Id: ChangeLog,v 1.120 2001/04/30 09:34:35 cameron Exp $ + $Id: ChangeLog,v 1.121 2001/05/02 02:00:18 cameron Exp $ Index: Vanilla/Makefile.in diff -u Vanilla/Makefile.in:1.2 Vanilla/Makefile.in:1.3 --- Vanilla/Makefile.in:1.2 Fri Apr 27 20:37:24 2001 +++ Vanilla/Makefile.in Tue May 1 21:00:18 2001 @@ -1,4 +1,4 @@ -# $Id: Makefile.in,v 1.2 2001/04/28 01:37:24 cameron Exp $ +# $Id: Makefile.in,v 1.3 2001/05/02 02:00:18 cameron Exp $ # # Installers, you should not need to edit this file. # Everything should be setup in the configuration script. @@ -13,11 +13,8 @@ .PHONY: rmdependencies clean reallyclean install installbin server utils startup rsa_utils do_xsg do_pledit do_robots do_gum -DEP_INCS = cflags.h ${srcdir}/ntserv/data.c ${srcdir}/ntserv/data.h \ - ntserv/defs.h config.h system.mk null +all: null $(PMAKE) server utils startup rsa_utils do_xsg do_pledit do_robots do_robotd @GUM@ -all: $(PMAKE) server utils startup rsa_utils do_xsg do_pledit do_robots do_robotd @GUM@ - depend: system.mk cd ntserv; $(MAKE) depend cd robots; $(MAKE) depend @@ -36,7 +33,7 @@ touch null $(MAKE) depend -system.mk: ${srcdir}/system.mk.in ${srcdir}/config.h.in ${srcdir}/configure +system.mk: ${srcdir}/system.mk.in ${srcdir}/include/config.h.in ${srcdir}/configure if [ -f config.status ]; then ./config.status else @@ -47,37 +44,37 @@ touch config.h # make the server binaries and such -server: $(DEP_INCS) rsalib +server: null rsalib cd ntserv; $(MAKE) -do_robots: $(DEP_INCS) +do_robots: cd robots; $(MAKE) -do_robotd: $(DEP_INCS) +do_robotd: cd robotd; $(MAKE) -do_gum: $(DEP_INCS) +do_gum: cd gum; $(MAKE) -do_xsg: $(DEP_INCS) +do_xsg: cd xsg; $(MAKE); -do_pledit: $(DEP_INCS) +do_pledit: cd pledit; $(MAKE) -rsalib: $(DEP_INCS) +rsalib: - at if [ -f res-rsa/Makefile ]; then \ (cd res-rsa; $(MAKE) librsa.a) \ fi -utils: $(DEP_INCS) rsalib +utils: rsalib cd tools; $(MAKE) cd sequencer; $(MAKE) -rsa_utils: $(DEP_INCS) +rsa_utils: cd keycomp; $(MAKE) -startup: $(DEP_INCS) +startup: cd newstartd; $(MAKE) cflags.h: Makefile $(CONFIG) Index: Vanilla/configure diff -u Vanilla/configure:1.22 Vanilla/configure:1.23 --- Vanilla/configure:1.22 Mon Apr 30 04:34:35 2001 +++ Vanilla/configure Tue May 1 21:00:18 2001 @@ -4041,11 +4041,11 @@ ac_given_srcdir=$srcdir ac_given_INSTALL="$INSTALL" -trap 'rm -fr `echo "system.mk Makefile ntserv/defs.h ntserv/Makefile tools/Makefile +trap 'rm -fr `echo "system.mk Makefile ntserv/Makefile tools/Makefile sequencer/Makefile newstartd/Makefile robots/Makefile keycomp/Makefile xsg/Makefile pledit/Makefile robotd/Makefile docs/Makefile tools/no_geno_timer tools/geno_timer - docs/sample_geno_timer_crontab docs/sample_sysdef config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 + docs/sample_geno_timer_crontab docs/sample_sysdef include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <<EOF @@ -4147,7 +4147,7 @@ cat >> $CONFIG_STATUS <<EOF -CONFIG_FILES=\${CONFIG_FILES-"system.mk Makefile ntserv/defs.h ntserv/Makefile tools/Makefile +CONFIG_FILES=\${CONFIG_FILES-"system.mk Makefile ntserv/Makefile tools/Makefile sequencer/Makefile newstartd/Makefile robots/Makefile keycomp/Makefile xsg/Makefile pledit/Makefile robotd/Makefile docs/Makefile tools/no_geno_timer tools/geno_timer @@ -4232,7 +4232,7 @@ if test "${CONFIG_HEADERS+set}" != set; then EOF cat >> $CONFIG_STATUS <<EOF - CONFIG_HEADERS="config.h" + CONFIG_HEADERS="include/config.h" EOF cat >> $CONFIG_STATUS <<\EOF fi Index: Vanilla/configure.in diff -u Vanilla/configure.in:1.24 Vanilla/configure.in:1.25 --- Vanilla/configure.in:1.24 Mon Apr 30 04:34:35 2001 +++ Vanilla/configure.in Tue May 1 21:00:18 2001 @@ -2,7 +2,7 @@ dnl generate the file "configure", which is run during Netrek installation dnl to configure the system for the local environment. AC_INIT(name.c) -AC_CONFIG_HEADER(config.h) +AC_CONFIG_HEADER(include/config.h) #---------------------------------------------------- # For which code are we checking? (server, cow) @@ -481,7 +481,7 @@ fi -AC_OUTPUT(system.mk Makefile ntserv/defs.h ntserv/Makefile tools/Makefile +AC_OUTPUT(system.mk Makefile ntserv/Makefile tools/Makefile sequencer/Makefile newstartd/Makefile robots/Makefile keycomp/Makefile xsg/Makefile pledit/Makefile robotd/Makefile docs/Makefile tools/no_geno_timer tools/geno_timer Index: Vanilla/system.mk.in diff -u Vanilla/system.mk.in:1.10 Vanilla/system.mk.in:1.11 --- Vanilla/system.mk.in:1.10 Mon Apr 30 04:34:35 2001 +++ Vanilla/system.mk.in Tue May 1 21:00:18 2001 @@ -53,8 +53,8 @@ EXTRAINCS = # -I/usr/local/X11R5/include -NETREK_INCLUDES = -I../ntserv -I at srcdir@/../ntserv - +# NETREK_INCLUDES = -I../ntserv -I at srcdir@/../ntserv +# # Some systems don't have strdup() or random() # Comment out if you have strdup() and random() @@ -80,9 +80,5 @@ RSA_SRC = @NORSA@ rsa_key.c RSA_INCS = @NORSA@ @MPINC@ RSA_LIB = @NORSA@ @RSALIB@ @MPLIB@ - -FLAGS = @CFLAGS@ $(EXTRAFLAGS) $(NETREK_INCLUDES) $(RSA_FLAGS) - -# In config.h now -DIRS = # -DLIBDIR=\"$(LIBDIR)\" +FLAGS = @CFLAGS@ $(EXTRAFLAGS) $(RSA_FLAGS)