Update of /cvsroot/netrek/server/Vanilla/gum In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv693/gum Modified Files: Makefile.am Makefile.in aclocal.m4 Log Message: libnetrek.a Index: aclocal.m4 =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/gum/aclocal.m4,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- aclocal.m4 10 Apr 2006 04:24:50 -0000 1.2 +++ aclocal.m4 22 Apr 2006 11:31:53 -0000 1.3 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.9.5 -*- Autoconf -*- +# generated automatically by aclocal 1.9.6 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # 2005 Free Software Foundation, Inc. @@ -17,7 +17,7 @@ dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS dnl -AC_DEFUN(AM_PATH_GTK, +AC_DEFUN([AM_PATH_GTK], [dnl dnl Get the cflags and libraries from the gtk-config script dnl @@ -223,7 +223,7 @@ # Call AM_AUTOMAKE_VERSION so it can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.9.5])]) + [AM_AUTOMAKE_VERSION([1.9.6])]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- Index: Makefile.in =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/gum/Makefile.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Makefile.in 10 Apr 2006 04:24:50 -0000 1.3 +++ Makefile.in 22 Apr 2006 11:31:53 -0000 1.4 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -14,8 +14,6 @@ @SET_MAKE@ -SOURCES = $(gum_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -56,7 +54,7 @@ am_gum_OBJECTS = support.$(OBJEXT) main.$(OBJEXT) signals.$(OBJEXT) \ id.$(OBJEXT) xmalloc.$(OBJEXT) gum_OBJECTS = $(am_gum_OBJECTS) -gum_DEPENDENCIES = ../ntserv/data.o +gum_DEPENDENCIES = ../ntserv/libnetrek.a DEFAULT_INCLUDES = -I. -I$(srcdir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -168,7 +166,7 @@ signals.c signals.h \ id.c xmalloc.c -gum_LDADD = @GTK_LIBS@ ../ntserv/data.o +gum_LDADD = @GTK_LIBS@ ../ntserv/libnetrek.a AM_CFLAGS = @AM_CFLAGS@ -DPACKAGE_DATA_DIR=\"@prefix@\" all: all-recursive Index: Makefile.am =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/gum/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Makefile.am 10 Apr 2006 04:24:50 -0000 1.3 +++ Makefile.am 22 Apr 2006 11:31:53 -0000 1.4 @@ -13,7 +13,7 @@ signals.c signals.h \ id.c xmalloc.c -gum_LDADD = @GTK_LIBS@ ../ntserv/data.o +gum_LDADD = @GTK_LIBS@ ../ntserv/libnetrek.a AM_CFLAGS = @AM_CFLAGS@ -DPACKAGE_DATA_DIR=\"@prefix@\"