Revision: 6284
Author: ek.kato
Date: Wed Mar 24 19:48:48 2010
Log: * Merge r6154, r6242 from trunk.
http://code.google.com/p/uim/source/detail?r=6284
Modified:
/branches/1.5/gtk
/branches/1.5/gtk/Makefile.am
/branches/1.5/helper/Makefile.am
=======================================
--- /branches/1.5/gtk/Makefile.am Mon Mar 17 13:29:47 2008
+++ /branches/1.5/gtk/Makefile.am Wed Mar 24 19:48:48 2010
@@ -7,21 +7,15 @@
if GTK2
im_uim_la = im-uim.la
-im_uim_la_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) \
- @EBCONF_EBINCS@ @EBCONF_ZLIBINCS@ \
- @EBCONF_PTHREAD_CPPFLAGS@ \
- @EBCONF_INTLINCS@
-im_uim_la_CFLAGS = @GTK2_CFLAGS@ @EBCONF_PTHREAD_CFLAGS@ -Wall
+im_uim_la_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
+im_uim_la_CFLAGS = @GTK2_CFLAGS@
module_LTLIBRARIES = $(im_uim_la)
im_uim_la_SOURCES = $(IM_UIM_SOURCES)
-im_uim_la_LDFLAGS = -module -avoid-version @GTK2_LIBS@ \
- @EBCONF_PTHREAD_LDFLAGS@
+im_uim_la_LDFLAGS = -module -avoid-version @GTK2_LIBS@
im_uim_la_LIBADD = $(top_builddir)/uim/libuim-scm.la \
- $(top_builddir)/uim/libuim.la \
- @EBCONF_EBLIBS@ @EBCONF_ZLIBLIBS@ \
- @EBCONF_INTLLIBS@
+ $(top_builddir)/uim/libuim.la
if LIBUIM_X_UTIL
im_uim_la_LIBADD += $(top_builddir)/uim/libuim-x-util.la
endif
@@ -35,6 +29,13 @@
if EB
IM_UIM_SOURCES += uim-eb.c uim-eb.h
+im_uim_la_CPPFLAGS += @EBCONF_EBINCS@ @EBCONF_ZLIBINCS@ \
+ @EBCONF_PTHREAD_CPPFLAGS@ \
+ @EBCONF_INTLINCS@
+im_uim_la_CFLAGS += @EBCONF_PTHREAD_CFLAGS@
+im_uim_la_LDFLAGS += @EBCONF_PTHREAD_LDFLAGS@
+im_uim_la_LIBADD += @EBCONF_EBLIBS@ @EBCONF_ZLIBLIBS@ \
+ @EBCONF_INTLLIBS@
endif
noinst_PROGRAMS = gtk-rc-get-immodule-file
=======================================
--- /branches/1.5/helper/Makefile.am Mon Sep 17 07:53:54 2007
+++ /branches/1.5/helper/Makefile.am Wed Mar 24 19:48:48 2010
@@ -61,13 +61,13 @@
uim_candwin_gtk_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim-scm.la \
$(top_builddir)/uim/libuim.la
uim_candwin_gtk_CPPFLAGS = -I$(top_srcdir)
-uim_candwin_gtk_CFLAGS = @GTK2_CFLAGS@ -Wall
+uim_candwin_gtk_CFLAGS = @GTK2_CFLAGS@
uim_toolbar_gtk_SOURCES = toolbar-standalone-gtk.c toolbar-common-gtk.c
uim_toolbar_gtk_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim-scm.la \
$(top_builddir)/uim/libuim.la
uim_toolbar_gtk_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
-uim_toolbar_gtk_CFLAGS = @GTK2_CFLAGS@ -Wall
+uim_toolbar_gtk_CFLAGS = @GTK2_CFLAGS@
uim_toolbar_gtk_systray_SOURCES = toolbar-systray-gtk.c
toolbar-common-gtk.c \
eggtrayicon.c eggtrayicon.h
@@ -75,19 +75,19 @@
$(top_builddir)/uim/libuim-scm.la \
$(top_builddir)/uim/libuim.la
uim_toolbar_gtk_systray_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
-uim_toolbar_gtk_systray_CFLAGS = @GTK2_CFLAGS@ -Wall
+uim_toolbar_gtk_systray_CFLAGS = @GTK2_CFLAGS@
uim_im_switcher_gtk_SOURCES = im-switcher-gtk.c
uim_im_switcher_gtk_LDADD = @GTK2_LIBS@
$(top_builddir)/uim/libuim-scm.la \
$(top_builddir)/uim/libuim.la
uim_im_switcher_gtk_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
-uim_im_switcher_gtk_CFLAGS = @GTK2_CFLAGS@ -Wall
+uim_im_switcher_gtk_CFLAGS = @GTK2_CFLAGS@
uim_input_pad_ja_SOURCES = input-pad-ja.c
uim_input_pad_ja_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim-scm.la \
$(top_builddir)/uim/libuim.la
uim_input_pad_ja_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
-uim_input_pad_ja_CFLAGS = @GTK2_CFLAGS@ -Wall
+uim_input_pad_ja_CFLAGS = @GTK2_CFLAGS@
if PREF
if GTK2_4
@@ -102,7 +102,7 @@
uim_pref_gtk_LDADD += $(top_builddir)/uim/libuim-x-util.la
endif
uim_pref_gtk_CPPFLAGS = $(helper_defs) -I$(top_srcdir) -I$(top_builddir)
-uim_pref_gtk_CFLAGS = @GTK2_CFLAGS@ -Wall
+uim_pref_gtk_CFLAGS = @GTK2_CFLAGS@
endif
endif
To unsubscribe from this group, send email to uim-commit+unsubscribegooglegroups.com or
reply to this email with the words "REMOVE ME" as the subject.
