Rename gis_test to gis-demo

diff --git a/TODO b/TODO
index 7ae09061c85586321da7e48933d977c68eb67a06..4e40f91fb1ad94bf74e583d83ad63e1badffc101 100644 (file)
--- a/TODO
+++ b/TODO
@@ -11,7 +11,6 @@ GisObject:
   - Move to subdirctory?
 
 gis-demo:
-  - Rename gis_test -> gis_demo
   - Add configs, prefs, name spoofing, offline
 
 roam:

diff --git a/src/.gitignore b/src/.gitignore
index 44417177126ae79616173e45069af1bc7a31539f..60ae69333b656fca4235cdf5b7a31494d6130e32 100644 (file)
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -7,7 +7,7 @@
 *.so
 .deps
 .libs
+gis-demo
 gis-marshal.[ch]
-gis_test
 gmon.*
 tile_test

diff --git a/src/Makefile.am b/src/Makefile.am
index 265abdd0221ccb104573638b1005daba66bd7388..844d54df396060c20cd45674f6077b74496330aa 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -43,11 +43,11 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libgis.pc
 
 # Test programs
-bin_PROGRAMS = gis_test tile_test
+bin_PROGRAMS = gis-demo tile_test
 
-gis_test_SOURCES  = gis_test.c gis.h
-gis_test_LDADD    = $(AM_LDADD) libgis.la
-gis_test_LDFLAGS  = -static
+gis_demo_SOURCES  = gis-demo.c gis.h
+gis_demo_LDADD    = $(AM_LDADD) libgis.la
+gis_demo_LDFLAGS  = -static
 
 tile_test_SOURCES = tile_test.c   \
        gis-util.c   gis-util.h   \
@@ -63,13 +63,13 @@ MAINTAINERCLEANFILES = Makefile.in
        glib-genmarshal --prefix=gis_cclosure_marshal --header $< > $@
 
 test: all .libs/gis
-       ./gis_test
+       ./gis-demo
 
 gdb: all .libs/gis
-       gdb ./gis_test
+       gdb ./gis-demo
 
 ddd: all .libs/gis
-       ddd ./gis_test
+       ddd ./gis-demo
 
 .libs/gis: plugins/.libs
        ln -sf ../plugins/.libs .libs/gis
@@ -82,5 +82,5 @@ memcheck: all
                 --leak-resolution=high         \
                 --num-callers=50               \
                 --suppressions=gtk.suppression \
-                ./gis_test                     \
+                ./gis-demo                     \
        2> valgrind.out

diff --git a/src/gis_test.c b/src/gis-demo.c
similarity index 97%
rename from src/gis_test.c
rename to src/gis-demo.c
index 97269949731d743cd008199f4c606accea41869b..803e51ad8d457dc3a65b238480b933a1a5ece4b6 100644 (file)
--- a/src/gis_test.c
+++ b/src/gis-demo.c
@@ -27,7 +27,7 @@
 static gboolean on_key_press(GtkWidget *widget, GdkEventKey *event,
                gpointer _window)
 {
-       g_debug("GisTest: on_key_press - key=%x, state=%x",
+       g_debug("GisDemo: on_key_press - key=%x, state=%x",
                        event->keyval, event->state);
        GtkWidget *window = _window;
        switch (event->keyval) {