GNOME.org
 

ekiga r7066 - in branches/gnome-2-24/lib/engine: audioinput/null audioinput/ptlib audioinput/skel audiooutput/null audiooutput/ptlib audiooutput/skel hal/dbus videoinput/mlogo videoinput/ptlib videoinput/skel videooutput/skel

Author: sfre
Date: Tue Sep 23 11:57:53 2008
New Revision: 7066
URL: http://svn.gnome.org/viewvc/ekiga?rev=7066&view=rev

Log:
Fix missing CFLAGS for PTLib.

Some CFLAGS were missing in some engine modules that use PTLIB (mostly
for PTRACE).

Backported from trunk.

Modified:
   branches/gnome-2-24/lib/engine/audioinput/null/Makefile.am
   branches/gnome-2-24/lib/engine/audioinput/ptlib/Makefile.am
   branches/gnome-2-24/lib/engine/audioinput/skel/Makefile.am
   branches/gnome-2-24/lib/engine/audiooutput/null/Makefile.am
   branches/gnome-2-24/lib/engine/audiooutput/ptlib/Makefile.am
   branches/gnome-2-24/lib/engine/audiooutput/skel/Makefile.am
   branches/gnome-2-24/lib/engine/hal/dbus/Makefile.am
   branches/gnome-2-24/lib/engine/videoinput/mlogo/Makefile.am
   branches/gnome-2-24/lib/engine/videoinput/ptlib/Makefile.am
   branches/gnome-2-24/lib/engine/videoinput/skel/Makefile.am
   branches/gnome-2-24/lib/engine/videooutput/skel/Makefile.am

Modified: branches/gnome-2-24/lib/engine/audioinput/null/Makefile.am
==============================================================================
--- branches/gnome-2-24/lib/engine/audioinput/null/Makefile.am	(original)
+++ branches/gnome-2-24/lib/engine/audioinput/null/Makefile.am	Tue Sep 23 11:57:53 2008
@@ -2,7 +2,7 @@
 
 audioinput_dir = $(top_srcdir)/lib/engine/audioinput/null
 
-AM_CXXFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS)
+AM_CXXFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS) $(PTLIB_CFLAGS)
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/gmconf \
@@ -19,4 +19,4 @@
 	$(audioinput_dir)/audioinput-main-null.h \
 	$(audioinput_dir)/audioinput-main-null.cpp 
 
-libgmaudioinput_null_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GLIB_LIBS)
+libgmaudioinput_null_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GLIB_LIBS) $(PTLIB_LIBS)

Modified: branches/gnome-2-24/lib/engine/audioinput/ptlib/Makefile.am
==============================================================================
--- branches/gnome-2-24/lib/engine/audioinput/ptlib/Makefile.am	(original)
+++ branches/gnome-2-24/lib/engine/audioinput/ptlib/Makefile.am	Tue Sep 23 11:57:53 2008
@@ -2,7 +2,7 @@
 
 audioinput_dir = $(top_srcdir)/lib/engine/audioinput/ptlib
 
-AM_CXXFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS)
+AM_CXXFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS) $(PTLIB_CFLAGS)
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/gmconf \
@@ -19,4 +19,4 @@
 	$(audioinput_dir)/audioinput-main-ptlib.h \
 	$(audioinput_dir)/audioinput-main-ptlib.cpp 
 
-libgmaudioinput_ptlib_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GLIB_LIBS)
+libgmaudioinput_ptlib_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GLIB_LIBS) $(PTLIB_LIBS)

Modified: branches/gnome-2-24/lib/engine/audioinput/skel/Makefile.am
==============================================================================
--- branches/gnome-2-24/lib/engine/audioinput/skel/Makefile.am	(original)
+++ branches/gnome-2-24/lib/engine/audioinput/skel/Makefile.am	Tue Sep 23 11:57:53 2008
@@ -2,7 +2,7 @@
 
 audioinput_dir = $(top_srcdir)/lib/engine/audioinput/skel
 
-AM_CXXFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS)
+AM_CXXFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS) $(PTLIB_CFLAGS)
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/gmconf \
@@ -20,4 +20,4 @@
 	$(audioinput_dir)/audioinput-gmconf-bridge.h \
 	$(audioinput_dir)/audioinput-gmconf-bridge.cpp
 
-libgmaudioinput_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GLIB_LIBS)
+libgmaudioinput_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GLIB_LIBS) $(PTLIB_LIBS)

Modified: branches/gnome-2-24/lib/engine/audiooutput/null/Makefile.am
==============================================================================
--- branches/gnome-2-24/lib/engine/audiooutput/null/Makefile.am	(original)
+++ branches/gnome-2-24/lib/engine/audiooutput/null/Makefile.am	Tue Sep 23 11:57:53 2008
@@ -2,7 +2,7 @@
 
 audiooutput_dir = $(top_srcdir)/lib/engine/audiooutput/null
 
-AM_CXXFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS)
+AM_CXXFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS) $(PTLIB_CFLAGS)
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/gmconf \
@@ -18,4 +18,4 @@
 	$(audiooutput_dir)/audiooutput-main-null.h \
 	$(audiooutput_dir)/audiooutput-main-null.cpp 
 
-libgmaudiooutput_null_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GLIB_LIBS)
+libgmaudiooutput_null_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GLIB_LIBS) $(PTLIB_LIBS)

Modified: branches/gnome-2-24/lib/engine/audiooutput/ptlib/Makefile.am
==============================================================================
--- branches/gnome-2-24/lib/engine/audiooutput/ptlib/Makefile.am	(original)
+++ branches/gnome-2-24/lib/engine/audiooutput/ptlib/Makefile.am	Tue Sep 23 11:57:53 2008
@@ -2,7 +2,7 @@
 
 audiooutput_dir = $(top_srcdir)/lib/engine/audiooutput/ptlib
 
-AM_CXXFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS)
+AM_CXXFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS) $(PTLIB_CFLAGS)
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/gmconf \
@@ -18,4 +18,4 @@
 	$(audiooutput_dir)/audiooutput-main-ptlib.h \
 	$(audiooutput_dir)/audiooutput-main-ptlib.cpp 
 
-libgmaudiooutput_ptlib_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GLIB_LIBS)
+libgmaudiooutput_ptlib_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GLIB_LIBS) $(PTLIB_LIBS)

Modified: branches/gnome-2-24/lib/engine/audiooutput/skel/Makefile.am
==============================================================================
--- branches/gnome-2-24/lib/engine/audiooutput/skel/Makefile.am	(original)
+++ branches/gnome-2-24/lib/engine/audiooutput/skel/Makefile.am	Tue Sep 23 11:57:53 2008
@@ -2,7 +2,7 @@
 
 audiooutput_dir = $(top_srcdir)/lib/engine/audiooutput/skel
 
-AM_CXXFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS)
+AM_CXXFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS) $(PTLIB_CFLAGS)
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/gmconf \
@@ -22,4 +22,4 @@
 	$(audiooutput_dir)/audiooutput-gmconf-bridge.h \
 	$(audiooutput_dir)/audiooutput-gmconf-bridge.cpp
 
-libgmaudiooutput_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GLIB_LIBS)
+libgmaudiooutput_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GLIB_LIBS) $(PTLIB_LIBS)

Modified: branches/gnome-2-24/lib/engine/hal/dbus/Makefile.am
==============================================================================
--- branches/gnome-2-24/lib/engine/hal/dbus/Makefile.am	(original)
+++ branches/gnome-2-24/lib/engine/hal/dbus/Makefile.am	Tue Sep 23 11:57:53 2008
@@ -2,7 +2,7 @@
 
 hal_dir = $(top_srcdir)/lib/engine/hal/dbus
 
-AM_CXXFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS)
+AM_CXXFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS) $(PTLIB_CFLAGS)
 
 AM_CFLAGS = $(GLIB_CFLAGS) $(DBUS_CFLAGS)
 
@@ -31,7 +31,7 @@
 # forces the HAVE :
 BUILT_SOURCES = hal-marshal.h hal-marshal.c
 
-libgmhal_dbus_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GLIB_LIBS) $(DBUS_LIBS)
+libgmhal_dbus_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GLIB_LIBS) $(DBUS_LIBS) $(PTLIB_LIBS)
 
 hal-marshal.h: hal-marshal.list
 	$(LIBTOOL) --mode=execute glib-genmarshal --prefix=gm_hal_dbus_marshal $^ --header > $  tmp && mv $  tmp $@

Modified: branches/gnome-2-24/lib/engine/videoinput/mlogo/Makefile.am
==============================================================================
--- branches/gnome-2-24/lib/engine/videoinput/mlogo/Makefile.am	(original)
+++ branches/gnome-2-24/lib/engine/videoinput/mlogo/Makefile.am	Tue Sep 23 11:57:53 2008
@@ -2,7 +2,7 @@
 
 videoinput_dir = $(top_srcdir)/lib/engine/videoinput/mlogo
 
-AM_CXXFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS)
+AM_CXXFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS) $(PTLIB_CFLAGS)
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/gmconf \
@@ -20,4 +20,4 @@
 	$(videoinput_dir)/videoinput-main-mlogo.h \
 	$(videoinput_dir)/videoinput-main-mlogo.cpp 
 
-libgmvideoinput_mlogo_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GLIB_LIBS)
+libgmvideoinput_mlogo_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GLIB_LIBS) $(PTLIB_LIBS)

Modified: branches/gnome-2-24/lib/engine/videoinput/ptlib/Makefile.am
==============================================================================
--- branches/gnome-2-24/lib/engine/videoinput/ptlib/Makefile.am	(original)
+++ branches/gnome-2-24/lib/engine/videoinput/ptlib/Makefile.am	Tue Sep 23 11:57:53 2008
@@ -2,7 +2,7 @@
 
 videoinput_dir = $(top_srcdir)/lib/engine/videoinput/ptlib
 
-AM_CXXFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS)
+AM_CXXFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS) $(PTLIB_CFLAGS)
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/gmconf \
@@ -19,4 +19,4 @@
 	$(videoinput_dir)/videoinput-main-ptlib.h \
 	$(videoinput_dir)/videoinput-main-ptlib.cpp 
 
-libgmvideoinput_ptlib_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GLIB_LIBS)
+libgmvideoinput_ptlib_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GLIB_LIBS) $(PTLIB_LIBS)

Modified: branches/gnome-2-24/lib/engine/videoinput/skel/Makefile.am
==============================================================================
--- branches/gnome-2-24/lib/engine/videoinput/skel/Makefile.am	(original)
+++ branches/gnome-2-24/lib/engine/videoinput/skel/Makefile.am	Tue Sep 23 11:57:53 2008
@@ -2,7 +2,7 @@
 
 videoinput_dir = $(top_srcdir)/lib/engine/videoinput/skel
 
-AM_CXXFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS)
+AM_CXXFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS) $(PTLIB_CFLAGS)
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/gmconf \
@@ -20,4 +20,4 @@
 	$(videoinput_dir)/videoinput-gmconf-bridge.h \
 	$(videoinput_dir)/videoinput-gmconf-bridge.cpp
 
-libgmvideoinput_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GLIB_LIBS)
+libgmvideoinput_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GLIB_LIBS) $(PTLIB_CFLAGS)

Modified: branches/gnome-2-24/lib/engine/videooutput/skel/Makefile.am
==============================================================================
--- branches/gnome-2-24/lib/engine/videooutput/skel/Makefile.am	(original)
+++ branches/gnome-2-24/lib/engine/videooutput/skel/Makefile.am	Tue Sep 23 11:57:53 2008
@@ -2,7 +2,7 @@
 
 videooutput_dir = $(top_srcdir)/lib/engine/videooutput/skel
 
-AM_CXXFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS)
+AM_CXXFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS) $(PTLIB_CFLAGS)
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/gmconf \
@@ -18,4 +18,4 @@
 	$(videooutput_dir)/videooutput-gmconf-bridge.h  \
 	$(videooutput_dir)/videooutput-gmconf-bridge.cpp
 
-libgmvideooutput_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GLIB_LIBS)
+libgmvideooutput_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GLIB_LIBS) $(PTLIB_LIBS)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]