Version bump for 0.6

[grits] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 75c597f4df10769681d4443f1785f2d7006b913f..18659d3df686f0e17a3060c989e530933636dd46 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,7 @@ SUBDIRS = data objects . plugins
 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
+AM_LDFLAGS  = -Wl,--as-needed -Wl,--no-undefined
 
 BUILT_SOURCES = grits-marshal.c grits-marshal.h
 
@@ -40,7 +40,7 @@ libgrits_la_SOURCES = grits.h \
 libgrits_la_CPPFLAGS = $(AM_CPPFLAGS) \
        -DPKGDATADIR="\"$(dots)$(datadir)/$(GRITS_SUBDIR)\"" \
        -DPLUGINSDIR="\"$(dots)$(libdir)/$(GRITS_SUBDIR)\""
-libgrits_la_LIBADD  = $(AM_LDADD) \
+libgrits_la_LIBADD  = $(AM_LDADD) -lm \
        objects/libgrits-objects.la \
        data/libgrits-data.la
 libgrits_la_LDFLAGS = $(AM_LDFLAGS) \
@@ -49,7 +49,7 @@ libgrits_la_LDFLAGS = $(AM_LDFLAGS) \
 # Demo program
 if WIN32
 AM_CPPFLAGS += -DUSE_WGL
-AM_LDFLAGS  += -mwindows
+AM_LDFLAGS  += -mwindows -no-undefined
 dots         = ..
 else
 AM_CPPFLAGS += -DUSE_GLX
@@ -98,5 +98,5 @@ memcheck: all
                 --num-callers=50               \
                 --suppressions=gtk.suppression \
                 --suppressions=/usr/lib/valgrind/default.supp \
-                ./grits-test                   \
+                .libs/grits-test               \
        2> valgrind.out