Move OpenGL code from GisOpenGL to objects

[grits] / src / objects / Makefile.am

diff --git a/src/objects/Makefile.am b/src/objects/Makefile.am
index 9cf5b6ac59b2e164e73a5041b21ce3d88860e3d8..844352ff202c8ae93d48a6dcc3badd70311704a3 100644 (file)
--- a/src/objects/Makefile.am
+++ b/src/objects/Makefile.am
@@ -1,9 +1,14 @@
-AM_CFLAGS  = -Wall --std=gnu99 -fPIC -I../
-AM_CFLAGS += $(GLIB_CFLAGS) $(CAIRO_CFLAGS)
+AM_CFLAGS  = -Wall --std=gnu99 -I$(top_srcdir)/src
+AM_CFLAGS += $(GLIB_CFLAGS) $(GTK_CFLAGS) $(CAIRO_CFLAGS)
+if NOTWIN32
+AM_CFLAGS += -fPIC
+endif
 
-gis_includedir = $(includedir)/gis
-gis_include_HEADERS = \
-       gis-object.h  \
+gis_objects_includedir = $(includedir)/gis/objects
+gis_objects_include_HEADERS = \
+       gis-object.h \
+       gis-marker.h \
+       gis-callback.h \
        gis-tile.h
 
 noinst_LTLIBRARIES = libgis-objects.la