Proper use of 'top_srcdir' and 'abs_top_builddir'
authorZeeshan Ali (Khattak) <zeeshanak@gnome.org>
Tue, 26 May 2009 18:21:28 +0000 (21:21 +0300)
committerZeeshan Ali (Khattak) <zeeshanak@gnome.org>
Tue, 26 May 2009 21:10:41 +0000 (00:10 +0300)
Use $(top_srcdir)/src/rygel as header and vapi search dir and
$(abs_top_builddir)/src/rygel as library path. Why? I have no idea, just
that this makes `make distcheck` succeed.

src/ui/Makefile.am

index e83f544..f9fa45a 100644 (file)
@@ -4,7 +4,7 @@ else
 shareddir = $(datadir)/rygel
 endif
 
-rygeldir = $(abs_top_builddir)/src/rygel
+rygeldir = $(top_srcdir)/src/rygel
 
 AM_CFLAGS = $(LIBGUPNP_CFLAGS) \
            $(LIBGUPNP_AV_CFLAGS) \
@@ -52,7 +52,7 @@ rygel_preferences_LDADD = $(LIBGUPNP_LIBS) \
                           $(UUID_LIBS) \
                           $(LIBSOUP_LIBS) \
                           $(GTK_LIBS) \
-                          -L$(rygeldir) \
+                          -L$(abs_top_builddir)/src/rygel \
                           -lrygel-configuration
 
 CLEANFILES = $(BUILT_SOURCES) rygel.stamp