-AM_CPPFLAGS=$(GTK_CFLAGS)
-GTKDOC_LIBS=$(GTK_LIBS) $(RSL_LIBS) \
- ../../src/aweather-aweather-*.o \
- ../../src/aweather-plugin-*.o \
- ../../src/aweather-location.o \
- ../../src/aweather-data.o
+AM_CPPFLAGS= $(RSL_CFLAGS) $(SOUP_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS)
+GTKDOC_LIBS=$(RSL_LIBS) $(SOUP_LIBS) $(GLIB_LIBS) $(GTK_LIBS) \
+ $(top_srcdir)/src/aweather-aweather-*.o \
+ $(top_srcdir)/src/gis/*.o \
+ $(top_srcdir)/src/plugins/*.o