Commit 6ddd15c7 authored by David Schleef's avatar David Schleef

gconf/Makefile.am: Fix for non-GNU make

Original commit message from CVS:
* gconf/Makefile.am: Fix for non-GNU make
* gst-libs/gst/Makefile.am: Change directory order to handle
GstPlay linking with gstinterfaces
* gst-libs/gst/audio/make_filter: make use of tr portable
* gst-libs/gst/play/Makefile.am: Add intended \
* gst-libs/gst/xwindowlistener/xwindowlistener.c:
(gst_xwin_set_clips): Switch to ISO variadic macro. Use a
function prototype instead of void *.
* gst/ffmpegcolorspace/gstffmpegcodecmap.c: Switch to ISO variadic
macro.
* gst/ffmpegcolorspace/gstffmpegcolorspace.c:
(gst_ffmpegcolorspace_chain): wrap NULL in GST_ELEMENT_ERROR call
* gst/videofilter/make_filter: make use of tr portable
* pkgconfig/Makefile.am: Remove GNU extension in Makefile target
parent 421f8499
2004-04-19 David Schleef <ds@schleef.org>
* gconf/Makefile.am: Fix for non-GNU make
* gst-libs/gst/Makefile.am: Change directory order to handle
GstPlay linking with gstinterfaces
* gst-libs/gst/audio/make_filter: make use of tr portable
* gst-libs/gst/play/Makefile.am: Add intended \
* gst-libs/gst/xwindowlistener/xwindowlistener.c:
(gst_xwin_set_clips): Switch to ISO variadic macro. Use a
function prototype instead of void *.
* gst/ffmpegcolorspace/gstffmpegcodecmap.c: Switch to ISO variadic
macro.
* gst/ffmpegcolorspace/gstffmpegcolorspace.c:
(gst_ffmpegcolorspace_chain): wrap NULL in GST_ELEMENT_ERROR call
* gst/videofilter/make_filter: make use of tr portable
* pkgconfig/Makefile.am: Remove GNU extension in Makefile target
2004-04-19 Thomas Vander Stichele <thomas at apestaart dot org> 2004-04-19 Thomas Vander Stichele <thomas at apestaart dot org>
* po/LINGUAS: * po/LINGUAS:
......
...@@ -2,7 +2,7 @@ schemadir = @GCONF_SCHEMA_FILE_DIR@ ...@@ -2,7 +2,7 @@ schemadir = @GCONF_SCHEMA_FILE_DIR@
schema_DATA = gstreamer-@GST_MAJORMINOR@.schemas schema_DATA = gstreamer-@GST_MAJORMINOR@.schemas
gstreamer-@GST_MAJORMINOR@.schemas: gstreamer.schemas gstreamer-@GST_MAJORMINOR@.schemas: gstreamer.schemas
cp $< $@ cp gstreamer.schemas gstreamer-@GST_MAJORMINOR@.schemas
install-data-local: install-data-local:
@GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) \ @GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) \
......
...@@ -19,7 +19,6 @@ SUBDIRS = \ ...@@ -19,7 +19,6 @@ SUBDIRS = \
media-info \ media-info \
mixer \ mixer \
navigation \ navigation \
play \
propertyprobe \ propertyprobe \
resample \ resample \
riff \ riff \
...@@ -27,7 +26,9 @@ SUBDIRS = \ ...@@ -27,7 +26,9 @@ SUBDIRS = \
tuner \ tuner \
video \ video \
xoverlay \ xoverlay \
$(X_DIR) $(X_DIR) \
. \
play
DIST_SUBDIRS = \ DIST_SUBDIRS = \
audio \ audio \
......
#!/bin/sh #!/bin/sh
LANG=C
LC_COLLATE=C
export LANG
export LC_COLLATE
Template=$1; Template=$1;
srcfile=$2; srcfile=$2;
...@@ -18,8 +23,11 @@ id=`echo '$Id$' | sed \ ...@@ -18,8 +23,11 @@ id=`echo '$Id$' | sed \
-e 's/\$I[d]: \([^$]*\)\$/\1/g'` -e 's/\$I[d]: \([^$]*\)\$/\1/g'`
echo $id echo $id
TEMPLATE=`echo $Template | tr a-z A-Z` TEMPLATE=`echo $Template | tr [:lower:] [:upper:]`
template=`echo $Template | tr A-Z a-z` template=`echo $Template | tr [:upper:] [:lower:]`
echo TEMPLATE $TEMPLATE
echo template $template
# remember to break up the Id: in the line below # remember to break up the Id: in the line below
sed \ sed \
......
...@@ -19,7 +19,7 @@ libgstplay_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@ ...@@ -19,7 +19,7 @@ libgstplay_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@
libgstplay_@GST_MAJORMINOR@include_HEADERS = $(play_headers) $(built_headers) libgstplay_@GST_MAJORMINOR@include_HEADERS = $(play_headers) $(built_headers)
libgstplay_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_CFLAGS) libgstplay_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_CFLAGS)
libgstplay_@GST_MAJORMINOR@_la_LIBADD = libgstplay_@GST_MAJORMINOR@_la_LIBADD = \
$(GST_LIBS) $(GST_PLUGINS_LIBS) \ $(GST_LIBS) $(GST_PLUGINS_LIBS) \
$(GST_CONTROL_LIBS) \ $(GST_CONTROL_LIBS) \
$(top_builddir)/gst-libs/gst/libgstinterfaces-$(GST_MAJORMINOR).la $(top_builddir)/gst-libs/gst/libgstinterfaces-$(GST_MAJORMINOR).la
......
...@@ -153,8 +153,8 @@ gst_x_window_listener_set_xid (GstXWindowListener * xwin, XID id) ...@@ -153,8 +153,8 @@ gst_x_window_listener_set_xid (GstXWindowListener * xwin, XID id)
* <kraxel@bytesex.org>, it was relicensed to LGPL. * <kraxel@bytesex.org>, it was relicensed to LGPL.
*/ */
#define DEBUG(format, args...) \ #define DEBUG(...) \
GST_DEBUG ("XWL: " format, ##args) GST_DEBUG ("XWL: " __VA_ARGS__)
static void static void
gst_xwin_set_overlay (GstXWindowListener * xwin, gboolean on) gst_xwin_set_overlay (GstXWindowListener * xwin, gboolean on)
...@@ -232,7 +232,7 @@ gst_xwin_set_clips (GstXWindowListener * xwin) ...@@ -232,7 +232,7 @@ gst_xwin_set_clips (GstXWindowListener * xwin)
guint numkids; guint numkids;
gint i; gint i;
gint x1, y1, w1, h1; gint x1, y1, w1, h1;
void *old_handler; XErrorHandler old_handler;
old_handler = XSetErrorHandler (x11_error_dev_null); old_handler = XSetErrorHandler (x11_error_dev_null);
......
...@@ -26,9 +26,9 @@ pcverfiles_gconf = $(GCONF_PC) $(GCONF_PC_UNINSTALLED) ...@@ -26,9 +26,9 @@ pcverfiles_gconf = $(GCONF_PC) $(GCONF_PC_UNINSTALLED)
all-local: $(pcverfiles) $(pcverfiles_uninstalled) all-local: $(pcverfiles) $(pcverfiles_uninstalled)
### how to generate versioned .pc files from .pc files in this dir ### how to generate versioned .pc files from .pc files in this dir
$(pcverfiles): %-@GST_MAJORMINOR@.pc: %.pc %-@GST_MAJORMINOR@.pc: %.pc
cp $< $@ cp $< $@
$(pcverfiles_uninstalled): %-@GST_MAJORMINOR@-uninstalled.pc: %-uninstalled.pc %-@GST_MAJORMINOR@-uninstalled.pc: %-uninstalled.pc
cp $< $@ cp $< $@
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment