GNOME.org
 

[ekiga] Avoid the big list of symlinks : the directory is versioned already!

commit 6d7cf7fbe8575edfb81641f3dddb6c6944e6b45c
Author: Julien Puydt <jpuydt gnome org>
Date:   Wed Jul 1 22:34:13 2009 +0200

    Avoid the big list of symlinks : the directory is versioned already!

 configure.ac                          |    6 ++++--
 lib/engine/account/Makefile.am        |    2 +-
 lib/engine/addressbook/Makefile.am    |    2 +-
 lib/engine/audioinput/Makefile.am     |    2 +-
 lib/engine/audiooutput/Makefile.am    |    2 +-
 lib/engine/chat/Makefile.am           |    2 +-
 lib/engine/components/kde/Makefile.am |    1 -
 lib/engine/framework/Makefile.am      |    2 +-
 lib/engine/hal/Makefile.am            |    2 +-
 lib/engine/notification/Makefile.am   |    2 +-
 lib/engine/plugin/Makefile.am         |    2 +-
 lib/engine/presence/Makefile.am       |    2 +-
 lib/engine/protocol/Makefile.am       |    2 +-
 lib/engine/videoinput/Makefile.am     |    2 +-
 lib/engine/videooutput/Makefile.am    |    2 +-
 15 files changed, 17 insertions(+), 16 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 599e83f..bb0076c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -829,23 +829,25 @@ case "$host" in
         bindir='${exec_prefix}'
         stacklibdir='${exec_prefix}'
         plugindir='${exec_prefix}/plugins'
-        PLUGIN_LIBTOOL_FLAGS="-no-undefined -avoid-version -module"
         PLUGIN_DIR='plugins'
         ;;
 *)
         versioned_libdir='${libdir}/AC_PACKAGE_NAME/AC_PACKAGE_VERSION'
         stacklibdir=${versioned_libdir}
         plugindir=${versioned_libdir}/plugins
-        PLUGIN_LIBTOOL_FLAGS="-module"
         PLUGIN_DIR='${plugindir}'
         ;;
 esac
 
+PLUGIN_LIBTOOL_FLAGS="-no-undefined -avoid-version -module"
+STACKLIB_LDFLAGS='-shared -module -no-undefined -avoid-version'
+
 AC_SUBST(bindir)
 AC_SUBST(stacklibdir)
 AC_SUBST(plugindir)
 AC_SUBST(PLUGIN_LIBTOOL_FLAGS)
 AC_SUBST(PLUGIN_DIR)
+AC_SUBST(STACKLIB_LDFLAGS)
 
 dnl ###########################################################################
 dnl  Output the different Makefiles
diff --git a/lib/engine/account/Makefile.am b/lib/engine/account/Makefile.am
index 9fe877c..de8dc8f 100644
--- a/lib/engine/account/Makefile.am
+++ b/lib/engine/account/Makefile.am
@@ -15,4 +15,4 @@ libaccount_la_SOURCES = \
 	$(account_dir)/account-core.h			\
 	$(account_dir)/account-core.cpp
 
-libaccount_la_LDFLAGS = -shared -module -no-undefined $(SIGC_LIBS) $(GLIB_LIBS)
+libaccount_la_LDFLAGS = $(STACKLIB_LDFLAGS) $(SIGC_LIBS) $(GLIB_LIBS)
diff --git a/lib/engine/addressbook/Makefile.am b/lib/engine/addressbook/Makefile.am
index c18f105..3cf3a5e 100644
--- a/lib/engine/addressbook/Makefile.am
+++ b/lib/engine/addressbook/Makefile.am
@@ -16,4 +16,4 @@ libgmaddressbook_la_SOURCES = \
 	$(addressbook_dir)/contact-core.h		\
 	$(addressbook_dir)/contact-core.cpp
 
-libgmaddressbook_la_LDFLAGS = -shared -module -no-undefined $(SIGC_LIBS) $(GLIB_LIBS)
+libgmaddressbook_la_LDFLAGS = $(STACKLIB_LDFLAGS) $(SIGC_LIBS) $(GLIB_LIBS)
diff --git a/lib/engine/audioinput/Makefile.am b/lib/engine/audioinput/Makefile.am
index 6ea3544..3899938 100644
--- a/lib/engine/audioinput/Makefile.am
+++ b/lib/engine/audioinput/Makefile.am
@@ -19,4 +19,4 @@ libgmaudioinput_la_SOURCES = \
 	$(audioinput_dir)/audioinput-gmconf-bridge.h \
 	$(audioinput_dir)/audioinput-gmconf-bridge.cpp
 
-libgmaudioinput_la_LDFLAGS = -shared -module -no-undefined $(SIGC_LIBS) $(GLIB_LIBS) $(PTLIB_LIBS)
+libgmaudioinput_la_LDFLAGS = $(STACKLIB_LDFLAGS) $(SIGC_LIBS) $(GLIB_LIBS) $(PTLIB_LIBS)
diff --git a/lib/engine/audiooutput/Makefile.am b/lib/engine/audiooutput/Makefile.am
index 68e9f51..39f8d2e 100644
--- a/lib/engine/audiooutput/Makefile.am
+++ b/lib/engine/audiooutput/Makefile.am
@@ -21,4 +21,4 @@ libgmaudiooutput_la_SOURCES = \
 	$(audiooutput_dir)/audiooutput-gmconf-bridge.h \
 	$(audiooutput_dir)/audiooutput-gmconf-bridge.cpp
 
-libgmaudiooutput_la_LDFLAGS = -shared -module -no-undefined $(SIGC_LIBS) $(GLIB_LIBS) $(PTLIB_LIBS)
+libgmaudiooutput_la_LDFLAGS = $(STACKLIB_LDFLAGS) $(SIGC_LIBS) $(GLIB_LIBS) $(PTLIB_LIBS)
diff --git a/lib/engine/chat/Makefile.am b/lib/engine/chat/Makefile.am
index 505e929..fdace9a 100644
--- a/lib/engine/chat/Makefile.am
+++ b/lib/engine/chat/Makefile.am
@@ -17,4 +17,4 @@ libgmchat_la_SOURCES = \
 	$(chat_dir)/chat-simple.h		\
 	$(chat_dir)/chat-multiple.h
 
-libgmchat_la_LDFLAGS = -shared -module -no-undefined $(SIGC_LIBS)
+libgmchat_la_LDFLAGS = $(STACKLIB_LDFLAGS) $(SIGC_LIBS)
diff --git a/lib/engine/components/kde/Makefile.am b/lib/engine/components/kde/Makefile.am
index d20c9f3..aa37e6d 100644
--- a/lib/engine/components/kde/Makefile.am
+++ b/lib/engine/components/kde/Makefile.am
@@ -13,5 +13,4 @@ libgmkde_la_SOURCES = \
 
 libgmkde_la_LDFLAGS = $(PLUGINS_LIBTOOL_FLAGS)
 libgmkde_la_LIBADD = \
-	$(top_builddir)/lib/engine/framework/libgmframework.la \
 	$(SIGC_LIBS) $(KDE_LIBS)
\ No newline at end of file
diff --git a/lib/engine/framework/Makefile.am b/lib/engine/framework/Makefile.am
index e88449f..7d06544 100644
--- a/lib/engine/framework/Makefile.am
+++ b/lib/engine/framework/Makefile.am
@@ -49,4 +49,4 @@ libgmframework_la_SOURCES = \
 	$(framework_dir)/ptr_array_const_iterator.h
 
 
-libgmframework_la_LDFLAGS = -shared -module -no-undefined $(SIGC_LIBS) $(GLIB_LIBS) $(XML_LIBS)
+libgmframework_la_LDFLAGS = $(STACKLIB_LDFLAGS) $(SIGC_LIBS) $(GLIB_LIBS) $(XML_LIBS)
diff --git a/lib/engine/hal/Makefile.am b/lib/engine/hal/Makefile.am
index c5303f4..a11a59f 100644
--- a/lib/engine/hal/Makefile.am
+++ b/lib/engine/hal/Makefile.am
@@ -13,4 +13,4 @@ libgmhal_la_SOURCES = \
 	$(hal_dir)/hal-core.h		\
 	$(hal_dir)/hal-core.cpp
 
-libgmhal_la_LDFLAGS = -shared -module -no-undefined $(SIGC_LIBS)
+libgmhal_la_LDFLAGS = $(STACKLIB_LDFLAGS) $(SIGC_LIBS)
diff --git a/lib/engine/notification/Makefile.am b/lib/engine/notification/Makefile.am
index 5762b04..e59c162 100644
--- a/lib/engine/notification/Makefile.am
+++ b/lib/engine/notification/Makefile.am
@@ -12,4 +12,4 @@ libnotification_la_SOURCES = \
 	$(notification_dir)/notification-core.h \
 	$(notification_dir)/notification-dummy.cpp
 
-libnotification_la_LDFLAGS = -shared -module -no-undefined $(SIGC_LIBS) $(GLIB_LIBS)
+libnotification_la_LDFLAGS = $(STACKLIB_LDFLAGS) $(SIGC_LIBS) $(GLIB_LIBS)
diff --git a/lib/engine/plugin/Makefile.am b/lib/engine/plugin/Makefile.am
index c083d1e..f0173b9 100644
--- a/lib/engine/plugin/Makefile.am
+++ b/lib/engine/plugin/Makefile.am
@@ -14,5 +14,5 @@ libplugin_la_SOURCES = \
 	$(plugin_dir)/plugin-core.h			\
 	$(plugin_dir)/plugin-core.cpp
 
-libplugin_la_LDFLAGS = -shared -module -no-undefined
+libplugin_la_LDFLAGS = $(STACKLIB_LDFLAGS)
 libplugin_la_LIBADD = $(SIGC_LIBS) $(GLIB_LIBS)
\ No newline at end of file
diff --git a/lib/engine/presence/Makefile.am b/lib/engine/presence/Makefile.am
index f4a6818..908e86f 100644
--- a/lib/engine/presence/Makefile.am
+++ b/lib/engine/presence/Makefile.am
@@ -22,4 +22,4 @@ libgmpresence_la_SOURCES = \
 	$(presence_dir)/presence-core.h		\
 	$(presence_dir)/presence-core.cpp
 
-libgmpresence_la_LDFLAGS = -shared -module -no-undefined $(SIGC_LIBS)
+libgmpresence_la_LDFLAGS = $(STACKLIB_LDFLAGS) $(SIGC_LIBS)
diff --git a/lib/engine/protocol/Makefile.am b/lib/engine/protocol/Makefile.am
index 91134ad..1d6e0f8 100644
--- a/lib/engine/protocol/Makefile.am
+++ b/lib/engine/protocol/Makefile.am
@@ -17,4 +17,4 @@ libgmprotocol_la_SOURCES = \
 	$(protocol_dir)/codec-description.h		\
 	$(protocol_dir)/codec-description.cpp
 
-libgmprotocol_la_LDFLAGS = -shared -module -no-undefined $(SIGC_LIBS) $(GLIB_LIBS)
+libgmprotocol_la_LDFLAGS = $(STACKLIB_LDFLAGS) $(SIGC_LIBS) $(GLIB_LIBS)
diff --git a/lib/engine/videoinput/Makefile.am b/lib/engine/videoinput/Makefile.am
index db091fe..86a677f 100644
--- a/lib/engine/videoinput/Makefile.am
+++ b/lib/engine/videoinput/Makefile.am
@@ -19,4 +19,4 @@ libgmvideoinput_la_SOURCES = \
 	$(videoinput_dir)/videoinput-gmconf-bridge.h \
 	$(videoinput_dir)/videoinput-gmconf-bridge.cpp
 
-libgmvideoinput_la_LDFLAGS = -shared -module -no-undefined $(SIGC_LIBS) $(GLIB_LIBS) $(PTLIB_CFLAGS)
+libgmvideoinput_la_LDFLAGS = $(STACKLIB_LDFLAGS) $(SIGC_LIBS) $(GLIB_LIBS) $(PTLIB_CFLAGS)
diff --git a/lib/engine/videooutput/Makefile.am b/lib/engine/videooutput/Makefile.am
index 8fbe755..d85608f 100644
--- a/lib/engine/videooutput/Makefile.am
+++ b/lib/engine/videooutput/Makefile.am
@@ -17,4 +17,4 @@ libgmvideooutput_la_SOURCES = \
 	$(videooutput_dir)/videooutput-gmconf-bridge.h  \
 	$(videooutput_dir)/videooutput-gmconf-bridge.cpp
 
-libgmvideooutput_la_LDFLAGS = -shared -module -no-undefined $(SIGC_LIBS) $(GLIB_LIBS) $(PTLIB_LIBS)
+libgmvideooutput_la_LDFLAGS = $(STACKLIB_LDFLAGS) $(SIGC_LIBS) $(GLIB_LIBS) $(PTLIB_LIBS)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]