[uim-commit] r689 - in trunk: examples/uim-custom helper qt uim

[ekato at freedesktop.org]

Author: ekato
Date: 2005-02-20 18:47:57 -0800 (Sun, 20 Feb 2005)
New Revision: 689

Modified:
   trunk/examples/uim-custom/Makefile.am
   trunk/helper/Makefile.am
   trunk/qt/Makefile.am
   trunk/uim/Makefile.am
Log:
* helper/Makefile.am : Fix linking order of libuim-custom.la and
  libuim.la.  Thanks Jeroen Ruigrok for reporting.
* qt/Makefile.am : Ditto.
* uim/Makefile.am : Ditto.
* examples/uim-custom/Makefile.am : Ditto.


Modified: trunk/examples/uim-custom/Makefile.am
===================================================================
--- trunk/examples/uim-custom/Makefile.am	2005-02-21 01:13:48 UTC (rev 688)
+++ trunk/examples/uim-custom/Makefile.am	2005-02-21 02:47:57 UTC (rev 689)
@@ -1,4 +1,4 @@
-uim_libs   = $(top_builddir)/uim/libuim.la $(top_builddir)/uim/libuim-custom.la
+uim_libs   = $(top_builddir)/uim/libuim-custom.la $(top_builddir)/uim/libuim.la
 
 noinst_PROGRAMS = uim-custom-variable uim-custom-dump uim-custom-update
 

Modified: trunk/helper/Makefile.am
===================================================================
--- trunk/helper/Makefile.am	2005-02-21 01:13:48 UTC (rev 688)
+++ trunk/helper/Makefile.am	2005-02-21 02:47:57 UTC (rev 689)
@@ -74,8 +74,8 @@
 
 if GTK2_4
 uim_pref_gtk_SOURCES  = pref-gtk.c pref-gtk-custom-widgets.c pref-gtk-custom-widgets.h
-uim_pref_gtk_LDADD    = @GTK2_LIBS@ $(top_builddir)/uim/libuim.la \
-			$(top_builddir)/uim/libuim-custom.la
+uim_pref_gtk_LDADD    = @GTK2_LIBS@ $(top_builddir)/uim/libuim-custom.la \
+			$(top_builddir)/uim/libuim.la
 uim_pref_gtk_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
 uim_pref_gtk_CFLAGS   = @GTK2_CFLAGS@ -Wall
 endif

Modified: trunk/qt/Makefile.am
===================================================================
--- trunk/qt/Makefile.am	2005-02-21 01:13:48 UTC (rev 688)
+++ trunk/qt/Makefile.am	2005-02-21 02:47:57 UTC (rev 689)
@@ -131,7 +131,7 @@
 
 uim_pref_qt_CXXFLAGS = $(QT_CXXFLAGS)
 uim_pref_qt_LDFLAGS  = $(QT_LDFLAGS)
-uim_pref_qt_LDADD    = $(top_builddir)/uim/libuim.la $(top_builddir)/uim/libuim-custom.la
+uim_pref_qt_LDADD    = $(top_builddir)/uim/libuim-custom.la $(top_builddir)/uim/libuim.la
 
 pref-customwidgets.h:pref-olisteditformbase.h pref-keyeditformbase.h pref-keygrabformbase.h
 pref-qt.h:pref-olisteditformbase.h pref-keyeditformbase.h pref-keygrabformbase.h

Modified: trunk/uim/Makefile.am
===================================================================
--- trunk/uim/Makefile.am	2005-02-21 01:13:48 UTC (rev 688)
+++ trunk/uim/Makefile.am	2005-02-21 02:47:57 UTC (rev 689)
@@ -100,7 +100,7 @@
 
 uim_plugin_LTLIBRARIES += libuim-custom-enabler.la
 libuim_custom_enabler_la_SOURCES = uim-custom-enabler.c
-libuim_custom_enabler_la_LIBADD = libuim.la libuim-custom.la
+libuim_custom_enabler_la_LIBADD = libuim-custom.la libuim.la
 libuim_custom_enabler_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
 libuim_custom_enabler_la_CPPFLAGS = -I$(top_srcdir)