Refactoring: use a GObject model to implement MapSource hierarchy tree

[andy/viking.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 17fd01e34476d3ac099e8b5370be501b2b757e15..ee8c8f9a9f00406d13e9e874445dd4941df698bb 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -141,13 +141,13 @@ endif
 
 viking_SOURCES = main.c
 
-INCLUDES        = @GTK_CFLAGS@ @EXPAT_CFLAGS@ @LIBCURL_CPPFLAGS@
-LDADD           = libviking.a @GTK_LIBS@ @EXPAT_LIBS@ @LIBCURL@ icons/libicons.a
+LDADD           = libviking.a $(PACKAGE_LIBS) @EXPAT_LIBS@ @LIBCURL@ icons/libicons.a
 if REALTIME_GPS_TRACKING
 LDADD           += -lgps
 endif
-#LDADD           = -lz @GTK_LIBS@ @EXPAT_LIBS@ @LIBCURL@
-AM_CFLAGS              = -Wall -g -D_GNU_SOURCE
+AM_CFLAGS              = -Wall -g -D_GNU_SOURCE \
+       $(PACKAGE_CFLAGS) \
+       @EXPAT_CFLAGS@ @LIBCURL_CPPFLAGS@
 
 @INTLTOOL_DESKTOP_RULE@