[farsight2/master] Renamed FS2_PLUGINS_BASE_CFLAGS to more meaningful FS2_INTERNAL_CFLAGS

Olivier Crête olivier.crete at collabora.co.uk
Tue Dec 23 15:19:00 PST 2008


---
 configure.ac                      |    8 ++++----
 docs/libs/Makefile.am             |    2 +-
 gst-libs/gst/farsight/Makefile.am |    2 +-
 gst/fsrtpconference/Makefile.am   |    2 +-
 tests/check/Makefile.am           |    2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index 803d546..2a7ac75 100644
--- a/configure.ac
+++ b/configure.ac
@@ -238,7 +238,7 @@ dnl *** finalize CFLAGS, LDFLAGS, LIBS
 dnl Overview:
 dnl FS2_OPTION_CFLAGS:  common flags for profiling, debugging, errors, ...
 dnl GST_*:              flags shared by built objects to link against GStreamer
-dnl FS2_PLUGINS_BASE_CFLAGS: to link internally against the plugins base libs
+dnl FS2_INTERNAL_CFLAGS: to link internally against the farsight libs
 dnl                          (compare to other modules) or for i18n
 dnl FS2_ALL_LDFLAGS:    linker flags shared by all
 dnl FS2_LIB_LDFLAGS:    additional linker flags for all libaries
@@ -258,11 +258,11 @@ AC_SUBST(FS2_OPTION_CFLAGS)
 dnl our libraries need to be versioned correctly
 AC_SUBST(FS2_LT_LDFLAGS)
 
-dnl FS2_PLUGINS_BASE_CFLAGS
+dnl FS2_INTERNAL_CFLAGS
 dnl prefer internal headers to already installed ones
 dnl also add builddir include for enumtypes and marshal
-FS2_PLUGINS_BASE_CFLAGS="-I\$(top_srcdir)/gst-libs -I\$(top_builddir)/gst-libs"
-AC_SUBST(FS2_PLUGINS_BASE_CFLAGS)
+FS2_INTERNAL_CFLAGS="-I\$(top_srcdir)/gst-libs -I\$(top_builddir)/gst-libs"
+AC_SUBST(FS2_INTERNAL_CFLAGS)
 
 dnl FIXME: do we want to rename to GST_ALL_* ?
 dnl add FS2_OPTION_CFLAGS, but overridable
diff --git a/docs/libs/Makefile.am b/docs/libs/Makefile.am
index 614dc4f..f2bfe49 100644
--- a/docs/libs/Makefile.am
+++ b/docs/libs/Makefile.am
@@ -59,7 +59,7 @@ extra_files =
 
 # CFLAGS and LDFLAGS for compiling scan program. Only needed if your app/lib
 # contains GtkObjects/GObjects and you want to document signals and properties.
-GTKDOC_CFLAGS = $(FS2_PLUGINS_BASE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS)
+GTKDOC_CFLAGS = $(FS2_INTERNAL_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS)
 GTKDOC_LIBS = $(SCANOBJ_DEPS) $(GST_BASE_LIBS)
 
 GTKDOC_CC=$(LIBTOOL) --mode=compile $(CC)
diff --git a/gst-libs/gst/farsight/Makefile.am b/gst-libs/gst/farsight/Makefile.am
index eefed8d..51adb0e 100644
--- a/gst-libs/gst/farsight/Makefile.am
+++ b/gst-libs/gst/farsight/Makefile.am
@@ -42,7 +42,7 @@ fs-marshal.c: Makefile fs-marshal.list
 		glib-genmarshal --body --prefix=fs_marshal $(srcdir)/fs-marshal.list >> fs-marshal.c.tmp
 		mv fs-marshal.c.tmp fs-marshal.c
 
-libgstfarsight_ at GST_MAJORMINOR@_la_CFLAGS = $(FS2_PLUGINS_BASE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
+libgstfarsight_ at GST_MAJORMINOR@_la_CFLAGS = $(FS2_INTERNAL_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
 libgstfarsight_ at GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS)
 libgstfarsight_ at GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
 
diff --git a/gst/fsrtpconference/Makefile.am b/gst/fsrtpconference/Makefile.am
index bca80f2..5c3fe1f 100644
--- a/gst/fsrtpconference/Makefile.am
+++ b/gst/fsrtpconference/Makefile.am
@@ -5,7 +5,7 @@ libfsrtpconference_la_SOURCES = \
 	fs-rtp-participant.c \
 	fs-rtp-session.c \
 	fs-rtp-stream.c
-libfsrtpconference_la_CFLAGS = $(FS2_PLUGINS_BASE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
+libfsrtpconference_la_CFLAGS = $(FS2_INTERNAL_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
 libfsrtpconference_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libfsrtpconference_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS)
 
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index a2f4082..3355b4d 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -39,4 +39,4 @@ LDADD = $(GST_LIBS) $(GST_CHECK_LIBS)
 
 base_fscodec_LDADD = $(LDADD) \
 	$(top_builddir)/gst-libs/gst/farsight/libgstfarsight-0.10.la
-base_fscodec_CFLAGS = $(FS2_PLUGINS_BASE_CFLAGS) $(CFLAGS) $(AM_CFLAGS)
+base_fscodec_CFLAGS = $(FS2_INTERNAL_CFLAGS) $(CFLAGS) $(AM_CFLAGS)
-- 
1.5.6.5




More information about the farsight-commits mailing list