mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-25 03:01:03 +00:00
More incremental updates. I can now successfully produce an rpm simply by typing ./autogen.sh;make rpm
. This is g...
Original commit message from CVS: More incremental updates. I can now successfully produce an rpm simply by typing `./autogen.sh;make rpm`. This is good ;-)
This commit is contained in:
parent
a45e61281d
commit
0032727103
11 changed files with 25 additions and 14 deletions
|
@ -5,7 +5,10 @@ bin_SCRIPTS = gstreamer-config
|
||||||
m4datadir = $(datadir)/aclocal
|
m4datadir = $(datadir)/aclocal
|
||||||
m4data_DATA = gstreamer.m4
|
m4data_DATA = gstreamer.m4
|
||||||
|
|
||||||
EXTRA_DIST = gstreamer.spec.in gstreamer-config.in
|
EXTRA_DIST = gstreamer.spec.in gstreamer-config.in gstreamer.m4
|
||||||
|
|
||||||
|
dist-hook:
|
||||||
|
cp gstreamer.spec $(distdir)
|
||||||
|
|
||||||
rpm: dist
|
rpm: dist
|
||||||
rpm -ta $(distdir).tar.gz
|
rpm -ta $(distdir).tar.gz
|
||||||
|
|
|
@ -77,7 +77,7 @@ AC_CHECK_HEADER(xaudio/decoder.h,[
|
||||||
])
|
])
|
||||||
AM_CONDITIONAL(HAVE_XAUDIO, test "x$HAVE_XAUDIO" = "xyes")
|
AM_CONDITIONAL(HAVE_XAUDIO, test "x$HAVE_XAUDIO" = "xyes")
|
||||||
|
|
||||||
PLUGINS_DIR=${libdir}/plugins
|
PLUGINS_DIR=${prefix}/lib/gst
|
||||||
AC_DEFINE_UNQUOTED(PLUGINS_DIR,"$PLUGINS_DIR")
|
AC_DEFINE_UNQUOTED(PLUGINS_DIR,"$PLUGINS_DIR")
|
||||||
AC_SUBST(PLUGINS_DIR)
|
AC_SUBST(PLUGINS_DIR)
|
||||||
|
|
||||||
|
@ -163,4 +163,7 @@ test/cothreads/Makefile
|
||||||
editor/Makefile
|
editor/Makefile
|
||||||
tools/Makefile
|
tools/Makefile
|
||||||
docs/Makefile
|
docs/Makefile
|
||||||
stamp.h])
|
stamp.h
|
||||||
|
gstreamer-config
|
||||||
|
gstreamer.spec])
|
||||||
|
AC_OUTPUT_COMMANDS([chmod +x gstreamer-config])
|
||||||
|
|
|
@ -22,6 +22,7 @@ libgsteditorinclude_HEADERS = \
|
||||||
|
|
||||||
|
|
||||||
bin_PROGRAMS = gsteditor
|
bin_PROGRAMS = gsteditor
|
||||||
|
gsteditor_SOURCES = editor.c
|
||||||
gsteditor_LDFLAGS = libgsteditor.la
|
gsteditor_LDFLAGS = libgsteditor.la
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,6 @@
|
||||||
lib_LTLIBRARIES = libgstelements.la
|
filterdir = $(libdir)/gst
|
||||||
|
|
||||||
|
filter_LTLIBRARIES = libgstelements.la
|
||||||
|
|
||||||
libgstelements_la_DEPENDENCIES = ../libgst.la
|
libgstelements_la_DEPENDENCIES = ../libgst.la
|
||||||
libgstelements_la_SOURCES = \
|
libgstelements_la_SOURCES = \
|
||||||
|
|
|
@ -1,4 +1,6 @@
|
||||||
lib_LTLIBRARIES = libgsttypes.la
|
filterdir = $(libdir)/gst
|
||||||
|
|
||||||
|
filter_LTLIBRARIES = libgsttypes.la
|
||||||
|
|
||||||
libgsttypes_la_DEPENDENCIES = ../libgst.la
|
libgsttypes_la_DEPENDENCIES = ../libgst.la
|
||||||
libgsttypes_la_SOURCES = \
|
libgsttypes_la_SOURCES = \
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
bin_PROGRAMS = save
|
noinst_PROGRAMS = save
|
||||||
|
|
||||||
INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(XML_CFLAGS) -I$(top_srcdir)
|
INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(XML_CFLAGS) -I$(top_srcdir)
|
||||||
LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(XML_LIBS) $(top_srcdir)/gst/libgst.la
|
LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(XML_LIBS) $(top_srcdir)/gst/libgst.la
|
||||||
|
|
|
@ -56,5 +56,4 @@ make prefix=$RPM_BUILD_ROOT%{prefix} install
|
||||||
|
|
||||||
%{prefix}/bin/*
|
%{prefix}/bin/*
|
||||||
%{prefix}/lib/*
|
%{prefix}/lib/*
|
||||||
%{prefix}/lib/gst/*
|
%{prefix}/include/*
|
||||||
%{prefix}/include/gst/*
|
|
||||||
|
|
|
@ -1,4 +1,6 @@
|
||||||
lib_LTLIBRARIES = libgstelements.la
|
filterdir = $(libdir)/gst
|
||||||
|
|
||||||
|
filter_LTLIBRARIES = libgstelements.la
|
||||||
|
|
||||||
libgstelements_la_DEPENDENCIES = ../libgst.la
|
libgstelements_la_DEPENDENCIES = ../libgst.la
|
||||||
libgstelements_la_SOURCES = \
|
libgstelements_la_SOURCES = \
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
lib_LTLIBRARIES = libcrashtest.la
|
noinst_LTLIBRARIES = libcrashtest.la
|
||||||
|
|
||||||
libcrashtest_la_SOURCES = \
|
libcrashtest_la_SOURCES = \
|
||||||
dummy.c
|
dummy.c
|
||||||
|
@ -6,6 +6,5 @@ libcrashtest_la_SOURCES = \
|
||||||
include_HEADERS = \
|
include_HEADERS = \
|
||||||
dummy.h
|
dummy.h
|
||||||
|
|
||||||
bin_PROGRAMS = test
|
noinst_PROGRAMS = test
|
||||||
|
|
||||||
test_LDADD = libcrashtest.la
|
test_LDADD = libcrashtest.la
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
bin_PROGRAMS = test simple
|
noinst_PROGRAMS = test simple
|
||||||
|
|
||||||
test_SOURCES = test.c cothreads.c object.c looper.c
|
test_SOURCES = test.c cothreads.c object.c looper.c
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
bin_PROGRAMS = readreg createreg
|
noinst_PROGRAMS = readreg createreg
|
||||||
|
|
||||||
INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(XML_CFLAGS) -I$(top_srcdir)
|
INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(XML_CFLAGS) -I$(top_srcdir)
|
||||||
LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(XML_LIBS) $(top_srcdir)/gst/libgst.la
|
LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(XML_LIBS) $(top_srcdir)/gst/libgst.la
|
||||||
|
|
Loading…
Reference in a new issue