[Goodies-commits] r5123 - in xfce4-dict/trunk: . lib panel-plugin src

[Enrico Troeger]

Author: enrico
Date: 2008-07-17 09:08:36 +0000 (Thu, 17 Jul 2008)
New Revision: 5123

Modified:
   xfce4-dict/trunk/ChangeLog
   xfce4-dict/trunk/lib/Makefile.am
   xfce4-dict/trunk/panel-plugin/Makefile.am
   xfce4-dict/trunk/src/Makefile.am
Log:
Build the static library part with libtool to get correctly linked (fixes #4235).

Modified: xfce4-dict/trunk/ChangeLog
===================================================================
--- xfce4-dict/trunk/ChangeLog	2008-07-17 05:35:14 UTC (rev 5122)
+++ xfce4-dict/trunk/ChangeLog	2008-07-17 09:08:36 UTC (rev 5123)
@@ -1,3 +1,9 @@
+2008-07-16  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
+
+ * Build the static library part with libtool to get correctly linked
+   (fixes #4235).
+
+
 2008-05-16  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
 
  * Fix crash due to accessing invalid memory when reading the

Modified: xfce4-dict/trunk/lib/Makefile.am
===================================================================
--- xfce4-dict/trunk/lib/Makefile.am	2008-07-17 05:35:14 UTC (rev 5122)
+++ xfce4-dict/trunk/lib/Makefile.am	2008-07-17 09:08:36 UTC (rev 5123)
@@ -1,9 +1,9 @@
 
 
-noinst_LIBRARIES = 								\
-	libdict.a
+noinst_LTLIBRARIES = 							\
+	libdict.la
 
-libdict_a_SOURCES =								\
+libdict_la_SOURCES =							\
 	libdict.h									\
 	aspell.c									\
 	aspell.h									\
@@ -16,13 +16,19 @@
 	prefs.c										\
 	prefs.h
 
-libdict_a_CFLAGS =								\
+libdict_la_CFLAGS =								\
 	-I$(top_srcdir)								\
 	$(LIBXFCEGUI4_CFLAGS)						\
 	$(LIBXFCE4PANEL_CFLAGS)						\
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"		\
 	@GTHREAD_CFLAGS@
 
+libdict_la_LIBADD =								\
+	$(LIBXFCE4PANEL_LIBS)						\
+	$(LIBXFCEGUI4_LIBS)							\
+	@GTHREAD_LIBS@
+
+
 noinst_DATA = 									\
 	inline-icon.h
 

Modified: xfce4-dict/trunk/panel-plugin/Makefile.am
===================================================================
--- xfce4-dict/trunk/panel-plugin/Makefile.am	2008-07-17 05:35:14 UTC (rev 5122)
+++ xfce4-dict/trunk/panel-plugin/Makefile.am	2008-07-17 09:08:36 UTC (rev 5123)
@@ -17,7 +17,7 @@
 	$(LIBXFCE4PANEL_LIBS)						\
 	$(LIBXFCEGUI4_LIBS)							\
 	@GTHREAD_LIBS@								\
-	../lib/libdict.a
+	$(top_builddir)/lib/libdict.la
 
 
 # .desktop file

Modified: xfce4-dict/trunk/src/Makefile.am
===================================================================
--- xfce4-dict/trunk/src/Makefile.am	2008-07-17 05:35:14 UTC (rev 5122)
+++ xfce4-dict/trunk/src/Makefile.am	2008-07-17 09:08:36 UTC (rev 5123)
@@ -19,7 +19,7 @@
 	$(LIBXFCE4UTIL_LIBS)						\
 	$(LIBXFCEGUI4_LIBS)							\
 	@GTHREAD_LIBS@								\
-	../lib/libdict.a
+	$(top_builddir)/lib/libdict.la
 
 
 desktopdir = $(datadir)/applications