[uim] r7013 committed - * helper/Makefile.am...

[codesite-noreply]

Revision: 7013
Author:   ek.kato
Date:     Fri May  6 01:32:09 2011
Log:      * helper/Makefile.am
  - (DISTCLEANFILES) : Add toolbar-commont-gtk3.c.
  - (uim_toolbar_applet_gnome3_LDADD) : Use GTK3_LIBS.
  - (uim_toolbar_applet_gnome3_CDFLAGS) : Use GTK3_CFLAGS.
  - (uim_toolbar_applet_gnome3_SOURCES) : Use
     toolbar-common-gtk3.c.
  - (toolbar-common-gtk3.c) : Symlink to toolbar-common-gtk3.c.

http://code.google.com/p/uim/source/detail?r=7013

Modified:
 /trunk/helper/Makefile.am

=======================================
--- /trunk/helper/Makefile.am   Wed May  4 23:25:10 2011
+++ /trunk/helper/Makefile.am   Fri May  6 01:32:09 2011
@@ -36,7 +36,7 @@
        sed s,@UIM_PIXMAPSDIR@,$(uim_pixmapsdir),g <$@.tmp >$@

 DISTCLEANFILES = GNOME_UimApplet.server.in GNOME_UimApplet.server \
-                GNOME_UimApplet.server.in.tmp
+                GNOME_UimApplet.server.in.tmp toolbar-common-gtk3.c
 endif

 if APPLET_GNOME3
@@ -46,17 +46,20 @@
 libexec_PROGRAMS = uim-toolbar-applet-gnome3
 endif

-uim_toolbar_applet_gnome3_LDADD = @GTK2_LIBS@ @APPLET_GNOME3_LIBS@ \
+uim_toolbar_applet_gnome3_LDADD = @GTK3_LIBS@ @APPLET_GNOME3_LIBS@ \
                           $(top_builddir)/uim/libuim-scm.la \
                           $(top_builddir)/uim/libuim.la \
                           $(top_builddir)/uim/libuim-custom.la
 uim_toolbar_applet_gnome3_CPPFLAGS = \
                           $(helper_defs) -I$(top_srcdir) -I$(top_builddir)

-uim_toolbar_applet_gnome3_CFLAGS = @GTK2_CFLAGS@ @APPLET_GNOME3_CFLAGS@
+uim_toolbar_applet_gnome3_CFLAGS = @GTK3_CFLAGS@ @APPLET_GNOME3_CFLAGS@

 uim_toolbar_applet_gnome3_SOURCES = toolbar-applet-gnome3.c \
-                              toolbar-common-gtk.c
+                              toolbar-common-gtk3.c
+
+toolbar-common-gtk3.c: $(top_srcdir)/helper/toolbar-common-gtk.c
+       $(LN_S) $< $@

 appletdir = $(datadir)/gnome-panel/applets
 applet_DATA = UimApplet.panel-applet