Revision: 6154 Author: ek.kato Date: Thu Feb 18 19:47:49 2010 Log: * gtk/Makefile.am - (im_uim_la_CPPFLAGS) : Enclose EBCONF_* things. - (im_uim_la_CFLAGS) : Ditto. - (im_uim_la_LDFLAGS) : Ditto. - (im_uim_la_LIBADD) : Ditto.
http://code.google.com/p/uim/source/detail?r=6154 Modified: /trunk/gtk/Makefile.am ======================================= --- /trunk/gtk/Makefile.am Tue Dec 8 01:26:48 2009 +++ /trunk/gtk/Makefile.am Thu Feb 18 19:47:49 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@ -Wall 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 @@ -34,7 +28,14 @@ compose.c compose.h text-util.c text-util.h if EB -im_uim_la_LIBADD += ../uim/lib-eb-static.la +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 += ../uim/lib-eb-static.la \ + @EBCONF_EBLIBS@ @EBCONF_ZLIBLIBS@ \ + @EBCONF_INTLLIBS@ endif noinst_PROGRAMS = gtk-rc-get-immodule-file
