diff options
| author | Murray Cumming <murrayc@murrayc.com> | 2012-12-07 15:59:46 +0100 |
|---|---|---|
| committer | Jens Georg <jensg@openismus.com> | 2012-12-12 19:58:26 +0100 |
| commit | f6a03475fa096b01a4b01747bba789e2b1d67360 (patch) | |
| tree | d5fc75947b8e83781fc51a8a2da0c2f56d267c33 /src/librygel-renderer-gst | |
| parent | 0a780ba217ef26ce6e03328a5c5c3c8372f5b149 (diff) | |
| download | rygel-f6a03475fa096b01a4b01747bba789e2b1d67360.tar.gz | |
build: Improve the build
* configure.ac: Mention dependencies as executable/library-specific
PKG_CHECK_MODULES() calls, instead of having one PKG_CHECK_MODULE()
call for each dependency and then listing those depdendencies'
CFLAGS and LIBS individually in each Makefile.am.
Also define the _VALAFLAGS in the same place, keeping things consistent.
* common.am: Clean this up, using more obvious variable names.
* various Makefile.am: Use the new structure.
Do not use AM_CFLAGS, instead specifying the CFLAGS, LIBS and VALAFLAGS
for each executable/library. As well as being cleaner, this would allow
us to convert to a non-recursive autotools build sometime in the future.
https://bugzilla.gnome.org/show_bug.cgi?id=689960
Diffstat (limited to 'src/librygel-renderer-gst')
| -rw-r--r-- | src/librygel-renderer-gst/Makefile.am | 20 | ||||
| -rw-r--r-- | src/librygel-renderer-gst/filelist.am | 1 |
2 files changed, 11 insertions, 10 deletions
diff --git a/src/librygel-renderer-gst/Makefile.am b/src/librygel-renderer-gst/Makefile.am index 139877a0..bc7e84a8 100644 --- a/src/librygel-renderer-gst/Makefile.am +++ b/src/librygel-renderer-gst/Makefile.am @@ -12,19 +12,21 @@ librygel_renderer_gst_2_0_la_SOURCES = \ $(LIBRYGEL_RENDERER_GST_VAPI_SOURCE_FILES) \ $(LIBRYGEL_RENDERER_GST_NONVAPI_SOURCE_FILES) -AM_CFLAGS += -DG_LOG_DOMAIN=\"Rygel\" \ - $(LIBGSTREAMER_CFLAGS) - librygel_renderer_gst_2_0_la_VALAFLAGS = \ -H rygel-renderer-gst.h --library=rygel-renderer-gst-2.0 \ --enable-experimental \ - $(LIBRYGEL_RENDERER_GST_VALAFLAGS_PKG) \ - $(RYGEL_COMMON_RENDERER_PLUGIN_VALAFLAGS) + $(LIBRYGEL_RENDERER_GST_DEPS_VALAFLAGS) \ + $(RYGEL_COMMON_LIBRYGEL_RENDERER_VALAFLAGS) \ + $(RYGEL_COMMON_VALAFLAGS) +librygel_renderer_gst_2_0_la_CFLAGS = \ + $(LIBRYGEL_RENDERER_GST_DEPS_CFLAGS) \ + $(RYGEL_COMMON_LIBRYGEL_RENDERER_CFLAGS) librygel_renderer_gst_2_0_la_LIBADD = \ - $(RYGEL_COMMON_RENDERER_LIBS) \ - $(LIBGSTREAMER_LIBS) \ - $(LIBGUPNP_AV_LIBS) -librygel_renderer_gst_2_0_la_LDFLAGS = -version-info $(LIBRYGEL_RENDERER_GST_VERSION) + $(LIBRYGEL_RENDERER_GST_DEPS_LIBS) \ + $(RYGEL_COMMON_LIBRYGEL_RENDERER_LIBS) +librygel_renderer_gst_2_0_la_LDFLAGS = \ + -version-info $(LIBRYGEL_RENDERER_GST_VERSION) \ + -DG_LOG_DOMAIN=\"Rygel\" rygel-renderer-gst.h rygel-renderer-gst-2.0.vapi: \ librygel_renderer_gst_2_0_la_vala.stamp diff --git a/src/librygel-renderer-gst/filelist.am b/src/librygel-renderer-gst/filelist.am index 351a37bc..7951d2b2 100644 --- a/src/librygel-renderer-gst/filelist.am +++ b/src/librygel-renderer-gst/filelist.am @@ -4,4 +4,3 @@ LIBRYGEL_RENDERER_GST_VAPI_SOURCE_FILES = \ LIBRYGEL_RENDERER_GST_NONVAPI_SOURCE_FILES = -LIBRYGEL_RENDERER_GST_VALAFLAGS_PKG = --pkg gstreamer-1.0 |