Switch from GtkGLExt to internal OpenGL handling

[grits] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 195c19920b9b68d58ad62fa5880d694ce521cb66..e9b536de50009a5501a17f276791bc5da866a1c8 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,74 +1,97 @@
-SUBDIRS = . plugins
+SUBDIRS = data objects . plugins
 
-AM_CFLAGS   = -Wall --std=gnu99
-AM_CPPFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(SOUP_CFLAGS)
-AM_LDADD    = $(GLIB_LIBS) $(GTK_LIBS) $(SOUP_LIBS)
+AM_CFLAGS   = -Wall --std=gnu99 -I$(top_srcdir)/src
+AM_CPPFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(GL_CFLAGS) $(SOUP_CFLAGS)
+AM_LDADD    = $(GLIB_LIBS) $(GTK_LIBS) $(GL_LIBS) $(SOUP_LIBS)
+AM_LDFLAGS  = --as-needed -no-undefined
 
-# Library
-BUILT_SOURCES = gis-marshal.c gis-marshal.h
-lib_LTLIBRARIES  = libgis.la
-gis_includedir = $(includedir)/gis
-gis_include_HEADERS = \
-       gis.h         \
-       gis-viewer.h  \
-       gis-prefs.h   \
-       gis-opengl.h  \
-       gis-plugin.h  \
-       gis-util.h    \
-       gis-data.h    \
-       gis-tile.h    \
-       gis-wms.h     \
-       gpqueue.h     \
+BUILT_SOURCES = grits-marshal.c grits-marshal.h
+
+
+# Headers
+grits_includedir = $(includedir)/grits
+grits_include_HEADERS = \
+       grits.h         \
+       grits-viewer.h  \
+       grits-prefs.h   \
+       grits-opengl.h  \
+       grits-plugin.h  \
+       grits-util.h    \
+       gpqueue.h       \
        roam.h
-libgis_la_SOURCES = \
-       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-data.c    gis-data.h    \
-       gis-tile.c    gis-tile.h    \
-       gis-wms.c     gis-wms.h     \
-       gis-object.c  gis-object.h  \
-       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
 
+# Pkg-config
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libgis.pc
+pkgconfig_DATA = grits.pc
+
+# Library
+lib_LTLIBRARIES = libgrits.la
+
+libgrits_la_SOURCES = grits.h \
+       grits-viewer.c  grits-viewer.h  \
+       grits-prefs.c   grits-prefs.h   \
+       grits-opengl.c  grits-opengl.h  \
+       grits-plugin.c  grits-plugin.h  \
+       grits-marshal.c grits-marshal.h \
+       grits-util.c    grits-util.h    \
+       roam.c          roam.h          \
+       gtkgl.c         gtkgl.h         \
+       gpqueue.c       gpqueue.h
+libgrits_la_CPPFLAGS = $(AM_CPPFLAGS) \
+       -DPKGDATADIR="\"$(dots)$(datadir)/$(GRITS_SUBDIR)\"" \
+       -DPLUGINSDIR="\"$(dots)$(libdir)/$(GRITS_SUBDIR)\""
+libgrits_la_LIBADD  = $(AM_LDADD) \
+       objects/libgrits-objects.la \
+       data/libgrits-data.la
+libgrits_la_LDFLAGS = $(AM_LDFLAGS) \
+       -version-info $(LIB_VERSION)
+
+# Demo program
+if WIN32
+AM_CPPFLAGS += -DUSE_WGL
+AM_LDFLAGS  += -mwindows
+dots         = ..
+else
+AM_CPPFLAGS += -DUSE_GLX
+BINLDFLAGS   = -static
+endif
+
+bin_PROGRAMS = grits-demo
+
+grits_demo_SOURCES = grits-demo.c
+grits_demo_LDADD   = $(AM_LDADD) libgrits.la
+grits_demo_LDFLAGS = $(BINLDFLAGS)
 
 # Test programs
-bin_PROGRAMS = gis_test wms_test
+noinst_PROGRAMS = grits-test tile-test
+
+grits_test_SOURCES = grits-test.c
+grits_test_LDADD   = $(AM_LDADD) libgrits.la
+grits_test_LDFLAGS = $(BINLDFLAGS)
 
-gis_test_SOURCES  = gis_test.c gis.h
-gis_test_LDADD    = $(AM_LDADD) libgis.la
-gis_test_LDFLAGS  = -static
+tile_test_SOURCES = tile-test.c
+tile_test_LDADD   = $(AM_LDADD) libgrits.la
+tile_test_LDFLAGS = $(BINLDFLAGS)
 
-wms_test_SOURCES  = wms_test.c gis-util.c gis-util.h gis-wms.c gis-wms.h gis-tile.c gis-tile.h
-wms_test_LDADD    = $(AM_LDADD)
 
 MAINTAINERCLEANFILES = Makefile.in
 
 .list.c:
-       glib-genmarshal --prefix=gis_cclosure_marshal --body   $< > $@
+       glib-genmarshal --prefix=grits_cclosure_marshal --body   $< > $@
 .list.h:
-       glib-genmarshal --prefix=gis_cclosure_marshal --header $< > $@
+       glib-genmarshal --prefix=grits_cclosure_marshal --header $< > $@
 
-test: all .libs/gis
-       ./gis_test
+test: all .libs/$(GRITS_SUBDIR)
+       ./grits-test
 
-gdb: all .libs/gis
-       gdb ./gis_test
+gdb: all .libs/$(GRITS_SUBDIR)
+       gdb ./grits-test
 
-ddd: all .libs/gis
-       ddd ./gis_test
+ddd: all .libs/$(GRITS_SUBDIR)
+       ddd ./grits-test
 
-.libs/gis: plugins/.libs
-       ln -sf ../plugins/.libs .libs/gis
+.libs/$(GRITS_SUBDIR): plugins/.libs
+       ln -sf ../plugins/.libs .libs/$(GRITS_SUBDIR)
 
 memcheck: all
        G_SLICE=always-malloc                   \
@@ -78,5 +101,6 @@ memcheck: all
                 --leak-resolution=high         \
                 --num-callers=50               \
                 --suppressions=gtk.suppression \
-                ./gis_test                     \
+                --suppressions=/usr/lib/valgrind/default.supp \
+                ./grits-test                   \
        2> valgrind.out