← Back to branch summary

~ubuntu-branches/ubuntu/precise/gst-plugins-base0.10/precise-updates

« back to all changes in this revision

Viewing changes to gst-libs/gst/pbutils/Makefile.am

  • Committer: Package Import Robot
  • Author(s): Sebastian Dröge
  • Date: 2011-12-11 19:27:10 UTC
  • mfrom: (11.7.12) (33.1.11 sid)
  • mto: This revision was merged to the branch mainline in revision 58.
  • Revision ID: package-import@ubuntu.com-20111211192710-f52020gqtas8705f
Tags: 0.10.35.2-1
http://bugs.debian.org/647485
* New upstream pre-release:
  + debian/rules,
    debian/build-deps.in:
    - Build-depend on GStreamer core >= 0.10.35.2.
    - Build-depend on GLib >= 2.24.
    - Build-depend on GTK+ 3.0.
    - Build-depend on zlib.
  + debian/patches/99_ltmain_as-needed.patch:
    - Refresh to apply cleanly again.
  + debian/libgstreamer-plugins-base.symbols:
    - Update symbols file with new API.
* debian/rules:
  + Remove all dependency_libs from the .la files.
* debian/control.in:
  + Put GI package into section introspection.
* debian/build-deps.in,
  debian/compat,
  debian/control.in,
  debian/gir1.2-gst-plugins-base.install,
  debian/gstreamer-alsa.install,
  debian/gstreamer-gnomevfs.install,
  debian/gstreamer-plugins-base.install,
  debian/gstreamer-x.install,
  debian/libgstreamer-plugins-base-dev.install,
  debian/libgstreamer-plugins-base.install,
  debian/rules:
  + Transition package to multi-arch (Closes: #647485).
    Patch taken from the Ubuntu package.

Show diffs side-by-side

added added

removed removed

Lines of Context:
gst-libs/gst/pbutils/Makefile.am
45
45
        pbutils-private.h
46
46
EXTRA_DIST = pbutils-marshal.list
47
47
 
48
 
libgstpbutils_@GST_MAJORMINOR@_la_LIBADD = \
49
 
  $(top_builddir)/gst-libs/gst/video/libgstvideo-@GST_MAJORMINOR@.la \
50
 
  $(GST_LIBS)
 
48
libgstpbutils_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS)
51
49
libgstpbutils_@GST_MAJORMINOR@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
52
50
libgstpbutils_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
53
51
 
83
81
                $(gir_cincludes) \
84
82
                -I$(top_srcdir)/gst-libs \
85
83
                -I$(top_builddir)/gst-libs \
86
 
                --add-include-path=$(srcdir)/../video \
87
84
                --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \
88
85
                --library=libgstpbutils-@GST_MAJORMINOR@.la \
89
86
                --library-path=`$(PKG_CONFIG) --variable=libdir gstreamer-@GST_MAJORMINOR@` \
91
88
                --include=Gst-@GST_MAJORMINOR@ \
92
89
                --libtool="$(top_builddir)/libtool" \
93
90
                --pkg gstreamer-@GST_MAJORMINOR@ \
94
 
                --pkg gstreamer-video-@GST_MAJORMINOR@ \
95
91
                --pkg-export gstreamer-pbutils-@GST_MAJORMINOR@ \
96
92
                --add-init-section="gst_init(NULL,NULL);" \
97
93
                --output $@ \
111
107
        $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
112
108
                $(INTROSPECTION_COMPILER) \
113
109
                --includedir=$(srcdir) \
114
 
                --includedir=$(srcdir)/../video \
115
110
                --includedir=$(builddir) \
116
111
                --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \
117
112
                $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)