GeoIP moved around a bit, also a few bits of cleanup and some optimisations in the...

diff --git a/geoip/Makefile.in b/geoip/Makefile.in
index 8cd94d26844e9e84545c387d9873759b1a555cf1..8fbf227f3faacfa61030a521aac5e6350b4c20d2 100644 (file)
--- a/geoip/Makefile.in
+++ b/geoip/Makefile.in
@@ -3,4 +3,7 @@
 .PHONY: all
 all: geoip.so
 
-geoip.so: geoip.o libGeoIP/GeoIP.o
+clean:
+       rm -f *.o *.so libGeoIP/*.o
+
+geoip.so: geoip.o libGeoIP.o

diff --git a/geoip/geoip.c b/geoip/geoip.c
index 6c1db14d3c321ff70592439c5d63a50c8032b7ba..0201f6be4dfaacd9ce16602b26dd922d652e1711 100644 (file)
--- a/geoip/geoip.c
+++ b/geoip/geoip.c
@@ -12,7 +12,7 @@
 
 #include <strings.h>
 
-#include "libGeoIP/GeoIP.h"
+#include "libGeoIP.h"
 #include "geoip.h"
 
 #warning This module is GPLed. Load/link at your peril.

diff --git a/geoip/libGeoIP/GeoIP.c b/geoip/libGeoIP.c
similarity index 99%
rename from geoip/libGeoIP/GeoIP.c
rename to geoip/libGeoIP.c
index e3f7818472d69bc36c7cf245b315673789c751b2..45378f770978cf61b1f7900b2f013e2c7fcd6037 100644 (file)
--- a/geoip/libGeoIP/GeoIP.c
+++ b/geoip/libGeoIP.c
@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "GeoIP.h"
+#include "libGeoIP.h"
 
 #include <netdb.h>
 #include <sys/socket.h>

diff --git a/geoip/libGeoIP/GeoIP.h b/geoip/libGeoIP.h
similarity index 100%
rename from geoip/libGeoIP/GeoIP.h
rename to geoip/libGeoIP.h