mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-20 14:18:34 +00:00
Code Issues 1 Projects Releases Wiki Activity

some fixes to handle builddirs, which distcheck uses, along with complete .pc files

Browse source 
Original commit message from CVS:
some fixes to handle builddirs, which distcheck uses, along with complete .pc files
This commit is contained in:
Erik Walthinsen 2001-05-28 07:46:21 +00:00
parent 13502fc293
commit c442db8165
4 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
configure.in
View file

@ -515,7 +515,7 @@ AC_LANG_SAVE
AC_LANG_CPLUSPLUS AC_LANG_CPLUSPLUS
AC_MSG_CHECKING(arts library) AC_MSG_CHECKING(arts library)
dnl AC_CHECK_LIB(artsflow, convert_stereo_ifloat_2float, HAVE_ARTS=yes, HAVE_ARTS=no, -lmcop -lartsflow_idl) dnl AC_CHECK_LIB(artsflow, convert_stereo_ifloat_2float, HAVE_ARTS=yes, HAVE_ARTS=no, -lmcop -lartsflow_idl)
AC_CHECK_HEADER(arts/artsflow.h, HAVE_ARTS=yes, HAVE_ARTS=no) dnl AC_CHECK_HEADER(arts/artsflow.h, HAVE_ARTS=yes, HAVE_ARTS=no)
AC_LANG_RESTORE AC_LANG_RESTORE
dnl Check for libraw1394 dnl Check for libraw1394
@ -939,18 +939,18 @@ AC_SUBST(CORE_CFLAGS)
dnl FIXME: having to AC_SUBST these is messy. Not sure if CPPFLAGS and LDFLAGS dnl FIXME: having to AC_SUBST these is messy. Not sure if CPPFLAGS and LDFLAGS
dnl need it, either. dnl need it, either.
dnl Private vars for libgst only
LIBGST_LIBS="$LIBS"
LIBGST_CFLAGS="$CFLAGS"
AC_SUBST(LIBGST_LIBS)
AC_SUBST(LIBGST_CFLAGS)
dnl Vars for everyone else dnl Vars for everyone else
GST_LIBS="\$(top_builddir)/gst/libgst.la" GST_LIBS="\$(top_builddir)/gst/libgst.la"
GST_CFLAGS="-I\$(top_srcdir) -I\$(top_srcdir)/include" GST_CFLAGS="-I\$(top_srcdir) -I\$(top_srcdir)/include"
AC_SUBST(GST_LIBS) AC_SUBST(GST_LIBS)
AC_SUBST(GST_CFLAGS) AC_SUBST(GST_CFLAGS)
dnl Private vars for libgst only
LIBGST_LIBS="$LIBS"
LIBGST_CFLAGS="$CFLAGS $GST_CFLAGS"
AC_SUBST(LIBGST_LIBS)
AC_SUBST(LIBGST_CFLAGS)
dnl CFLAGS for everyone else dnl CFLAGS for everyone else
CFLAGS="$CFLAGS $GST_CFLAGS" CFLAGS="$CFLAGS $GST_CFLAGS"
AC_SUBST(LIBS) AC_SUBST(LIBS)

9
gst/Makefile.am
View file

@ -52,11 +52,12 @@ libgst_la_SOURCES = \
#LTCOMPILE2=$(LTCOMPILE) -O2 #LTCOMPILE2=$(LTCOMPILE) -O2
#COMPILE2=$(COMPILE) -O2 #COMPILE2=$(COMPILE) -O2
cothreads.lo: cothreads.c cothreads.h gst_private.h ../config.h gstinfo.c \ # FIXME this only lists the x86 arch file, we really should merge them all
gstarch.h gsti386.h cothreads.lo: $(srcdir)/cothreads.c $(srcdir)/cothreads.h $(srcdir)/gst_private.h \
$(top_builddir)/config.h $(srcdir)/gstinfo.c $(srcdir)/gstarch.h $(srcdir)/gsti386.h
$(LIBTOOL) --mode=compile $(COMPILE) -O2 -c $< $(LIBTOOL) --mode=compile $(COMPILE) -O2 -c $<
cothreads.o: cothreads.c cothreads.h gst_private.h ../config.h gstinfo.c \ cothreads.o: $(srcdir)/cothreads.c $(srcdir)/cothreads.h $(srcdir)/gst_private.h \
gstarch.h gsti386.h $(top_builddir)/config.h $(srcdir)/gstinfo.c $(srcdir)/gstarch.h $(srcdir)/gsti386.h
$(COMPILE) -O2 -c $< $(COMPILE) -O2 -c $<
# NOTDEPEND.cothreads.lo: cothreads.c # NOTDEPEND.cothreads.lo: cothreads.c

2
gstreamer-uninstalled.pc.in
View file

@ -6,6 +6,6 @@ includedir=@includedir@
Name: GStreamer Uninstalled Name: GStreamer Uninstalled
Description: Streaming-media framework, Not Installed Description: Streaming-media framework, Not Installed
Version: @VERSION@ Version: @VERSION@
Requires: glib gtk+ Requires: glib >= 1.2.0, gtk+ >= 1.2.0, libxml >= 1.8.1
Libs: ${pcbuilddir}/${pcfiledir}/gst/libgst.la Libs: ${pcbuilddir}/${pcfiledir}/gst/libgst.la
Cflags: -I${pcbuilddir}/${pcfiledir} Cflags: -I${pcbuilddir}/${pcfiledir}

4
gstreamer.pc.in
View file

@ -5,7 +5,7 @@ includedir=@includedir@
Name: GStreamer Name: GStreamer
Description: Streaming-media framework Description: Streaming-media framework
Requires: Requires: glib >= 1.2.0, gtk+ >= 1.2.0, libxml >= 1.8.1
Version: @VERSION@ Version: @VERSION@
Libs: -L${libdir} -lgst Libs: -L${libdir} -lgst
Cflags: Cflags: -I${includedir}