Move objects to a subdirectory

- Organize automake files a bit while we're at it

diff --git a/configure.ac b/configure.ac
index 08cb84cd6815b45b2aa7bc45344abc861087f9f5..4d503a6b9b286f53bf7978718251bc1d7617753c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,14 +12,16 @@ PKG_PROG_PKG_CONFIG
 GTK_DOC_CHECK(1.9)
 
 # Check for required packages
 GTK_DOC_CHECK(1.9)
 
 # Check for required packages

-PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.14 gobject-2.0 gthread-2.0)
-PKG_CHECK_MODULES(GTK,  gtk+-2.0 >= 2.16 gtkglext-1.0)
-PKG_CHECK_MODULES(SOUP, libsoup-2.4 >= 2.26)
+PKG_CHECK_MODULES(GLIB,  glib-2.0 >= 2.14 gobject-2.0 gthread-2.0)
+PKG_CHECK_MODULES(CAIRO, cairo)
+PKG_CHECK_MODULES(GTK,   gtk+-2.0 >= 2.16 gtkglext-1.0)
+PKG_CHECK_MODULES(SOUP,  libsoup-2.4 >= 2.26)

 
 # Output 
 AC_CONFIG_FILES([
        Makefile
        src/Makefile
 
 # Output 
 AC_CONFIG_FILES([
        Makefile
        src/Makefile

+       src/objects/Makefile

        src/plugins/Makefile
        src/libgis.pc
        docs/Makefile
        src/plugins/Makefile
        src/libgis.pc
        docs/Makefile

diff --git a/src/.gitignore b/src/.gitignore
index 829ed843e7ceb08085acbce753a00864959cba8c..bfc4cc87cc249b297950a9a68cdf5f14033929b5 100644 (file)
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -1,3 +1,4 @@
+*.a

 *.exe
 *.la
 *.lo
 *.exe
 *.la
 *.lo

diff --git a/src/Makefile.am b/src/Makefile.am
index 67923f3cfae758a5c4151759eb2760f456c672f4..26b68566abe1bb4e18f53958c341b5c7e593b5a5 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,12 +1,14 @@
-SUBDIRS = . plugins
+SUBDIRS = objects . plugins

 
 

-AM_CFLAGS   = -Wall --std=gnu99
+AM_CFLAGS   = -Wall --std=gnu99 -Iobjects

 AM_CPPFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(SOUP_CFLAGS)
 AM_LDADD    = $(GLIB_LIBS) $(GTK_LIBS) $(SOUP_LIBS)
 AM_CPPFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(SOUP_CFLAGS)
 AM_LDADD    = $(GLIB_LIBS) $(GTK_LIBS) $(SOUP_LIBS)

+AM_LDFLAGS  = --as-needed -no-undefined

 
 

-# Library

 BUILT_SOURCES = gis-marshal.c gis-marshal.h
 BUILT_SOURCES = gis-marshal.c gis-marshal.h

-lib_LTLIBRARIES  = libgis.la
+
+
+# Headers

 gis_includedir = $(includedir)/gis
 gis_include_HEADERS = \
        gis.h         \
 gis_includedir = $(includedir)/gis
 gis_include_HEADERS = \
        gis.h         \


@@ -14,47 +16,47 @@ gis_include_HEADERS = \
        gis-prefs.h   \
        gis-opengl.h  \
        gis-plugin.h  \
        gis-prefs.h   \
        gis-opengl.h  \
        gis-plugin.h  \

-       gis-object.h  \

        gis-util.h    \
        gis-util.h    \

-       gis-tile.h    \

        gis-wms.h     \
        gis-data.h    \
        gpqueue.h     \
        roam.h
        gis-wms.h     \
        gis-data.h    \
        gpqueue.h     \
        roam.h

-libgis_la_SOURCES = \
+
+# Pkg-config
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libgis.pc
+
+# Library
+lib_LTLIBRARIES = libgis.la
+
+libgis_la_SOURCES = gis.h \

        gis-viewer.c  gis-viewer.h  \
        gis-prefs.c   gis-prefs.h   \
        gis-opengl.c  gis-opengl.h  \
        gis-plugin.c  gis-plugin.h  \
        gis-marshal.c gis-marshal.h \
        gis-util.c    gis-util.h    \
        gis-viewer.c  gis-viewer.h  \
        gis-prefs.c   gis-prefs.h   \
        gis-opengl.c  gis-opengl.h  \
        gis-plugin.c  gis-plugin.h  \
        gis-marshal.c gis-marshal.h \
        gis-util.c    gis-util.h    \

-       gis-tile.c    gis-tile.h    \

        gis-wms.c     gis-wms.h     \
        gis-data.c    gis-data.h    \
        gis-wms.c     gis-wms.h     \
        gis-data.c    gis-data.h    \

-       gis-object.c  gis-object.h  \

        roam.c        roam.h        \
        gpqueue.c     gpqueue.h
 libgis_la_CPPFLAGS = $(AM_CPPFLAGS) \
        roam.c        roam.h        \
        gpqueue.c     gpqueue.h
 libgis_la_CPPFLAGS = $(AM_CPPFLAGS) \

-       -DPKGDATADIR="\"$(datadir)/gis\"" -DPLUGINSDIR="\"$(libdir)/gis\""
-libgis_la_LIBADD = $(AM_LDADD)
-libgis_la_LDFLAGS = -no-undefined
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libgis.pc
+       -DPKGDATADIR="\"$(datadir)/gis\"" \
+       -DPLUGINSDIR="\"$(libdir)/gis\""
+libgis_la_LIBADD  = $(AM_LDADD) \
+       objects/libgis-objects.la

 
 # Test programs
 bin_PROGRAMS = gis-demo tile-test
 
 
 # Test programs
 bin_PROGRAMS = gis-demo tile-test
 

-gis_demo_SOURCES  = gis-demo.c gis.h
+gis_demo_SOURCES  = gis-demo.c

 gis_demo_LDADD    = $(AM_LDADD) libgis.la
 gis_demo_LDADD    = $(AM_LDADD) libgis.la

-gis_demo_LDFLAGS  = -static
-
-tile_test_SOURCES = tile-test.c   \
-       gis-util.c   gis-util.h   \
-       gis-tile.c   gis-tile.h   \
-       gis-object.c gis-object.h \
-       gis-wms.c    gis-wms.h
-tile_test_LDADD   = $(AM_LDADD)
+gis_demo_LDFLAGS  = $(AM_LDFLAGS) -static
+
+tile_test_SOURCES = tile-test.c
+tile_test_LDADD   = $(AM_LDADD) libgis.la
+tile_test_LDFLAGS = $(AM_LDFLAGS) -static
+

 
 MAINTAINERCLEANFILES = Makefile.in
 
 
 MAINTAINERCLEANFILES = Makefile.in
 

diff --git a/src/objects/Makefile.am b/src/objects/Makefile.am
new file mode 100644 (file)
index 0000000..eb7fe21
--- /dev/null
+++ b/src/objects/Makefile.am
@@ -0,0 +1,15 @@
+AM_CFLAGS  = -Wall --std=gnu99 -fPIC -I../
+AM_CFLAGS += $(GLIB_CFLAGS) $(CAIRO_CFLAGS)
+
+gis_includedir = $(includedir)/gis
+gis_include_HEADERS = \
+       gis-object.h  \
+       gis-tile.h
+
+noinst_LTLIBRARIES = libgis-objects.la
+libgis_objects_la_SOURCES = \
+       gis-object.c gis-object.h \
+       gis-tile.c   gis-tile.h
+libgis_objects_la_LDFLAGS = -static
+
+MAINTAINERCLEANFILES = Makefile.in

diff --git a/src/gis-object.c b/src/objects/gis-object.c
similarity index 99%
rename from src/gis-object.c
rename to src/objects/gis-object.c
index 4eca0774ccb8d1ed2c6ba0d2e2c98fe1ac90672f..fe51eb13b0e91c2c39afa4d7bb0a71767d93d09a 100644 (file)
--- a/src/gis-object.c
+++ b/src/objects/gis-object.c
@@ -19,7 +19,6 @@
 #include <GL/glu.h>
 
 #include "gis-object.h"
 #include <GL/glu.h>
 
 #include "gis-object.h"

-#include "gis-util.h"

 
 /* GisPoint */
 GisPoint *gis_point_new()
 
 /* GisPoint */
 GisPoint *gis_point_new()

diff --git a/src/gis-object.h b/src/objects/gis-object.h
similarity index 100%
rename from src/gis-object.h
rename to src/objects/gis-object.h

diff --git a/src/gis-tile.c b/src/objects/gis-tile.c
similarity index 100%
rename from src/gis-tile.c
rename to src/objects/gis-tile.c

diff --git a/src/gis-tile.h b/src/objects/gis-tile.h
similarity index 100%
rename from src/gis-tile.h
rename to src/objects/gis-tile.h

diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 3c022312d4f57e7b6844c2b26edba4c6bd804cd4..a531f8fc45f03a174cdb7a80d4db7323694fd6f2 100644 (file)
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -1,6 +1,6 @@
 MAINTAINERCLEANFILES = Makefile.in
 
 MAINTAINERCLEANFILES = Makefile.in
 

-AM_CFLAGS   = -Wall --std=gnu99  -I../
+AM_CFLAGS   = -Wall --std=gnu99 -I../ -I../objects

 AM_CPPFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(SOUP_CFLAGS)
 AM_LDFLAGS  = -module -avoid-version -no-undefined
 LIBS        = $(top_srcdir)/src/libgis.la
 AM_CPPFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(SOUP_CFLAGS)
 AM_LDFLAGS  = -module -avoid-version -no-undefined
 LIBS        = $(top_srcdir)/src/libgis.la