X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=src%2Fobjects%2FMakefile.am;h=119b0a4d633cd95bbfce3752116be4b354dd367b;hb=ae0f47ffeff87c31aa126934bcb08b68309c2a5f;hp=73c68edc5414e38b1255e2899c873c1f53b44e5e;hpb=1f59c39cbad9112d2c3fc06967f6e99a3d9c5a00;p=grits

diff --git a/src/objects/Makefile.am b/src/objects/Makefile.am
index 73c68ed..119b0a4 100644
--- a/src/objects/Makefile.am
+++ b/src/objects/Makefile.am
@@ -1,19 +1,31 @@
-AM_CFLAGS  = -Wall --std=gnu99 -fPIC -I$(top_srcdir)/src
-AM_CFLAGS += $(GLIB_CFLAGS) $(CAIRO_CFLAGS)
+AM_CFLAGS  = -Wall --std=gnu99 -I$(top_srcdir)/src
+AM_CFLAGS += $(GLIB_CFLAGS) $(GTK_CFLAGS) $(GL_CFLAGS) $(CAIRO_CFLAGS)
 
-gis_objects_includedir = $(includedir)/gis/objects
-gis_objects_include_HEADERS = \
-	gis-object.h \
-	gis-marker.h \
-	gis-callback.h \
-	gis-tile.h
+if !SYS_WIN
+AM_CFLAGS += -fPIC
+endif
 
-noinst_LTLIBRARIES = libgis-objects.la
-libgis_objects_la_SOURCES = \
-	gis-object.c   gis-object.h \
-	gis-marker.c   gis-marker.h \
-	gis-callback.c gis-callback.h \
-	gis-tile.c     gis-tile.h
-libgis_objects_la_LDFLAGS = -static
+grits_objects_includedir = $(includedir)/grits/objects
+grits_objects_include_HEADERS = \
+	grits-object.h   \
+	grits-marker.h   \
+	grits-callback.h \
+	grits-tile.h     \
+	grits-volume.h   \
+	grits-poly.h     \
+	grits-line.h     \
+	marching.h
+
+noinst_LTLIBRARIES = libgrits-objects.la
+libgrits_objects_la_SOURCES = \
+	grits-object.c   grits-object.h   \
+	grits-marker.c   grits-marker.h   \
+	grits-callback.c grits-callback.h \
+	grits-tile.c     grits-tile.h     \
+	grits-volume.c   grits-volume.h   \
+	grits-poly.c     grits-poly.h     \
+	grits-line.c     grits-line.h     \
+	marching.c       marching.h
+libgrits_objects_la_LDFLAGS = -static
 
 MAINTAINERCLEANFILES = Makefile.in