[NeoStats-Devel] [Commits] r2434 - in trunk/modules/statserv: . geoip geoipwin32

Author: Mark
Date: Sun Apr  3 06:58:17 2005
New Revision: 2434

Removed:
   trunk/modules/statserv/geoip/md5.c
   trunk/modules/statserv/geoip/md5.h
   trunk/modules/statserv/geoipwin32/md5.c
   trunk/modules/statserv/geoipwin32/md5.h
Modified:
   trunk/modules/statserv/Makefile.am
   trunk/modules/statserv/Makefile.in
   trunk/modules/statserv/statserv.vcproj
Log:
remove unused geoip code

Modified: trunk/modules/statserv/Makefile.am
==============================================================================
--- trunk/modules/statserv/Makefile.am	(original)
+++ trunk/modules/statserv/Makefile.am	Sun Apr  3 06:58:17 2005
@@ -7,8 +7,7 @@
 			server.c server.h version.c version.h \
 			geoip/GeoIPCity.c geoip/GeoIPCity.h \
 			geoip/GeoIPBitReader.c geoip/GeoIPBitReader.h \
-			geoip/GeoIP.c geoip/GeoIP.h \
-			geoip/global.h geoip/md5.c geoip/md5.h 
+			geoip/GeoIP.c geoip/GeoIP.h geoip/global.h 
 statserv_la_LDFLAGS	= -module -avoid-version -no-undefined
 AM_CFLAGS		= @PCRE_CFLAGS@ @CURL_CFLAGS@ -I$(top_srcdir)/lib/keeper/ -I$(top_srcdir)/lib/adns/ -Igeoip -DGEOIPDATADIR=\"$(datadir)\" \
 			-DSYSCONFDIR=\"$(sysconfdir)\"

Modified: trunk/modules/statserv/Makefile.in
==============================================================================
--- trunk/modules/statserv/Makefile.in	(original)
+++ trunk/modules/statserv/Makefile.in	Sun Apr  3 06:58:17 2005
@@ -66,7 +66,7 @@
 statserv_la_LIBADD =
 am_statserv_la_OBJECTS = ss_help.lo stats.lo statserv.lo htmlstats.lo \
 	tld.lo channel.lo user.lo network.lo server.lo version.lo \
-	GeoIPCity.lo GeoIPBitReader.lo GeoIP.lo md5.lo
+	GeoIPCity.lo GeoIPBitReader.lo GeoIP.lo
 statserv_la_OBJECTS = $(am_statserv_la_OBJECTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/lib/gdbm
 depcomp = $(SHELL) $(top_srcdir)/autotools/depcomp
@@ -215,8 +215,7 @@
 			server.c server.h version.c version.h \
 			geoip/GeoIPCity.c geoip/GeoIPCity.h \
 			geoip/GeoIPBitReader.c geoip/GeoIPBitReader.h \
-			geoip/GeoIP.c geoip/GeoIP.h \
-			geoip/global.h geoip/md5.c geoip/md5.h 
+			geoip/GeoIP.c geoip/GeoIP.h geoip/global.h 
 
 statserv_la_LDFLAGS = -module -avoid-version -no-undefined
 AM_CFLAGS = @PCRE_CFLAGS@ @CURL_CFLAGS@ -I$(top_srcdir)/lib/keeper/ -I$(top_srcdir)/lib/adns/ -Igeoip -DGEOIPDATADIR=\"$(datadir)\" \
@@ -290,7 +289,6 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GeoIPCity.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/channel.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/htmlstats.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md5.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/network.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/server.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ss_help.Plo@am__quote@
@@ -321,13 +319,6 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o GeoIP.lo `test -f 'geoip/GeoIP.c' || echo '$(srcdir)/'`geoip/GeoIP.c
 
-md5.lo: geoip/md5.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT md5.lo -MD -MP -MF "$(DEPDIR)/md5.Tpo" -c -o md5.lo `test -f 'geoip/md5.c' || echo '$(srcdir)/'`geoip/md5.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/md5.Tpo" "$(DEPDIR)/md5.Plo"; else rm -f "$(DEPDIR)/md5.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='geoip/md5.c' object='md5.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o md5.lo `test -f 'geoip/md5.c' || echo '$(srcdir)/'`geoip/md5.c
-
 mostlyclean-libtool:
 	-rm -f *.lo
 

Modified: trunk/modules/statserv/statserv.vcproj
==============================================================================
--- trunk/modules/statserv/statserv.vcproj	(original)
+++ trunk/modules/statserv/statserv.vcproj	Sun Apr  3 06:58:17 2005
@@ -212,12 +212,6 @@
 			<File
 				RelativePath=".\geoipwin32\global.h">
 			</File>
-			<File
-				RelativePath=".\geoipwin32\md5.c">
-			</File>
-			<File
-				RelativePath=".\geoipwin32\md5.h">
-			</File>
 		</Filter>
 		<File
 			RelativePath=".\html\index.tpl">