Add cube GtkGL example

[grits] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index aba03b776b2918b86a241e15c79ab8658bde6469..8726d838748912f2795f921481cf4d8f77d274ec 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,73 +1,116 @@
-AM_CFLAGS   = -Wall --std=gnu99 
-AM_CPPFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(SOUP_CFLAGS)
-AM_LDADD    = $(GLIB_LIBS) $(GTK_LIBS) $(SOUP_LIBS)
+SUBDIRS = data objects . plugins
 
-# Library
-BUILT_SOURCES = gis-marshal.c gis-marshal.h
-lib_LTLIBRARIES  = libgis.la
-gis_includedir = $(includedir)/gis
-gis_include_HEADERS = \
-       gis.h         \
-       gis-world.h   \
-       gis-view.h    \
-       gis-prefs.h   \
-       gis-opengl.h  \
-       gis-plugin.h  \
-       gis-data.h    \
-       gpqueue.h     \
-       roam.h        \
-       wms.h
-libgis_la_SOURCES = \
-       gis-world.c   gis-world.h   \
-       gis-view.c    gis-view.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-data.c    gis-data.h    \
-       roam.c        roam.h        \
-       wms.c         wms.h         \
-       gpqueue.c     gpqueue.h
-libgis_la_CPPFLAGS = $(AM_CPPFLAGS) \
-       -DPKGDATADIR="\"$(datadir)/gis\"" -DPLUGINSDIR="\"$(libdir)/gis\""
-libgis_la_LIBADD = $(AM_LDADD)
+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  = 
+
+# System dependant flags
+if SYS_WIN
+AM_LDFLAGS += -mwindows -no-undefined
+endif
+if SYS_MAC
+AM_CFLAGS  += -ObjC
+AM_LDFLAGS += -framework AppKit
+else
+AM_LDFLAGS += -Wl,--as-needed -Wl,--no-undefined
+endif
+
+# 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    \
+       gtkgl.h         \
+       gpqueue.h       \
+       roam.h
 
+# Pkg-config
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libgis.pc
+pkgconfig_DATA = grits.pc
+
+# GTK 2/3 compatability
+EXTRA_DIST = compat.h
+
+# 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) -lm \
+       objects/libgrits-objects.la \
+       data/libgrits-data.la
+libgrits_la_LDFLAGS = $(AM_LDFLAGS) \
+       -version-info $(LIB_VERSION)
+
+# Demo program
+bin_PROGRAMS = grits-demo
+
+grits_demo_SOURCES = grits-demo.c
+grits_demo_LDADD   = $(AM_LDADD) libgrits.la
 
 # Test programs
-bin_PROGRAMS = gis_test wms_test
+noinst_PROGRAMS = grits-test tile-test
 
-gis_test_SOURCES  = gis_test.c gis.h
-gis_test_LDADD    = $(AM_LDADD) .libs/libgis.a
+grits_test_SOURCES = grits-test.c
+grits_test_LDADD   = $(AM_LDADD) libgrits.la
 
-wms_test_SOURCES  = wms_test.c gis-world.c gis-world.h wms.c wms.h
-wms_test_LDADD    = $(AM_LDADD)
+tile_test_SOURCES = tile-test.c
+tile_test_LDADD   = $(AM_LDADD) libgrits.la
 
+# Clean
 MAINTAINERCLEANFILES = Makefile.in
 
+# Generated code 
+BUILT_SOURCES = grits-marshal.c grits-marshal.h
+
 .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 $< > $@
+
+# Debugging rules
+BUILT_SOURCES += .libs/$(GRITS_SUBDIR)
+
+.libs/$(GRITS_SUBDIR):
+       mkdir -p .libs
+       ln -sf ../plugins/.libs $@
 
 test: all
-       ./gis_test
+       G_MESSAGES_DEBUG=all \
+       ./grits-test
 
 gdb: all
-       LD_LIBRARY_PATH=.libs gdb .libs/gis_test
+       G_MESSAGES_DEBUG=all \
+       gdb ./.libs/grits-test
 
 ddd: all
-       LD_LIBRARY_PATH=.libs ddd .libs/gis_test
+       G_MESSAGES_DEBUG=all \
+       ddd ./grits-test
 
 memcheck: all
-       LD_LIBRARY_PATH=.libs                      \
-       G_SLICE=always-malloc                      \
-       G_DEBUG=gc-friendly,resident-modules       \
-       valgrind --track-origins=yes               \
-                --leak-check=full                 \
-                --leak-resolution=high            \
-                --num-callers=100                 \
-                --suppressions=../gtk.suppression \
-                .libs/gis_test                    \
+       G_SLICE=always-malloc                   \
+       G_DEBUG=gc-friendly,resident-modules    \
+       valgrind --track-origins=yes            \
+                --leak-check=full              \
+                --leak-resolution=high         \
+                --num-callers=50               \
+                --suppressions=gtk.suppression \
+                --suppressions=/usr/lib/valgrind/default.supp \
+                .libs/grits-test               \
        2> valgrind.out