Update windowing system tests

[grits] / src / plugins / Makefile.am

diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 3c022312d4f57e7b6844c2b26edba4c6bd804cd4..2572125cfed9d5a899dbf696daf9a3b7b1d9315a 100644 (file)
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -1,11 +1,18 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-AM_CFLAGS   = -Wall --std=gnu99  -I../
-AM_CPPFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(SOUP_CFLAGS)
-AM_LDFLAGS  = -module -avoid-version -no-undefined
-LIBS        = $(top_srcdir)/src/libgis.la
+AM_CFLAGS   = -Wall --std=gnu99 -I$(top_srcdir)/src
+AM_CPPFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(GL_CFLAGS) $(SOUP_CFLAGS)
+AM_LDFLAGS  = -shared -module -avoid-version
+LIBS        = $(top_srcdir)/src/libgrits.la
 
-pluginsdir  = "$(libdir)/gis"
+if SYS_WIN
+AM_LDFLAGS += -no-undefined
+endif
+if !SYS_MAC
+AM_LDFLAGS += -Wl,--as-needed
+endif
+
+pluginsdir  = "$(libdir)/$(GRITS_SUBDIR)"
 
 plugins_LTLIBRARIES = sat.la elev.la map.la env.la test.la
 sat_la_SOURCES      = sat.c  sat.h
@@ -14,10 +21,13 @@ map_la_SOURCES      = map.c  map.h
 env_la_SOURCES      = env.c  env.h
 test_la_SOURCES     = test.c test.h
 
+if HAVE_GLUT
 noinst_LTLIBRARIES  = teapot.la
 teapot_la_SOURCES   = \
-       $(top_srcdir)/examples/plugin/teapot.c
+       $(top_srcdir)/examples/plugin/teapot.c \
        $(top_srcdir)/examples/plugin/teapot.h
+teapot_la_LDFLAGS   = $(AM_LDFLAGS) -lglut -rpath $(libdir) # I hate you libtool
+endif
 
 test:
        ( cd ../; make test )