Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
phuang committed Feb 6, 2009
1 parent 0bcd2dd commit 142d69b
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 6 deletions.
4 changes: 2 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -219,9 +219,9 @@ ibus/interface/Makefile
ui/Makefile
ui/gtk/Makefile
ui/gtk/ibus-ui-gtk
ui/gtk/gtkpanel.xml
ui/gtk/gtkpanel.xml.in
gconf/Makefile
gconf/gconf.xml
gconf/gconf.xml.in
client/Makefile
client/gtk2/Makefile
client/qt4/Makefile
Expand Down
10 changes: 9 additions & 1 deletion gconf/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,20 @@ component_DATA = \
componentdir = $(pkgdatadir)/component

CLEANFILES = \
gconf.xml \
*.pyc \
$(NULL)

EXTRA_DIST = \
gconf.xml.in \
gconf.xml.in.in \
$(NULL)

gconf.xml: gconf.xml.in
( \
libexecdir=${libexecdir}; \
s=`cat $<`; \
eval "echo \"$${s}\""; \
) > $@

$(libibus):
$(MAKE) -C $(top_builddir)/src
2 changes: 1 addition & 1 deletion gconf/gconf.xml.in → gconf/gconf.xml.in.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<component>
<name>org.freedesktop.IBus.Config</name>
<description>GConf Config Component</description>
<exec>@prefix@/libexec/ibus-gconf</exec>
<exec>${libexecdir}/ibus-gconf</exec>
<version>@VERSION@</version>
<author>Peng Huang &lt;[email protected]&gt;</author>
<license>GPL</license>
Expand Down
10 changes: 9 additions & 1 deletion ui/gtk/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,22 @@ component_DATA = \
componentdir = $(pkgdatadir)/component

CLEANFILES = \
gtkpanel.xml \
*.pyc \
$(NULL)

EXTRA_DIST = \
ibus-ui-gtk.in \
gtkpanel.xml.in \
gtkpanel.xml.in.in \
$(NULL)

gtkpanel.xml: gtkpanel.xml.in
( \
libexecdir=${libexecdir}; \
s=`cat $<`; \
eval "echo \"$${s}\""; \
) > $@

test:
$(ENV) DBUS_DEBUG=true \
IBUS_PREFIX=@prefix@ \
Expand Down
2 changes: 1 addition & 1 deletion ui/gtk/gtkpanel.xml.in → ui/gtk/gtkpanel.xml.in.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<component>
<name>org.freedesktop.IBus.Panel</name>
<description>Gtk Panel Component</description>
<exec>@prefix@/libexec/ibus-ui-gtk</exec>
<exec>${libexecdir}/ibus-ui-gtk</exec>
<version>@VERSION@</version>
<author>Peng Huang &lt;[email protected]&gt;</author>
<license>GPL</license>
Expand Down

0 comments on commit 142d69b

Please sign in to comment.