-AM_CFLAGS = -Wall --std=gnu99 -I../
-AM_CPPFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(SOUP_CFLAGS)
-AM_LDFLAGS = -module -avoid-version
-LIBS = $(top_srcdir)/src/gis/libgis.la
+AM_CFLAGS = -Wall --std=gnu99 $(GIS_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/lib
+AM_LDFLAGS = -module -avoid-version -no-undefined
+LIBS = $(GIS_LIBS)