Skip to content

Commit

Permalink
Cleanup Makefile.am.
Browse files Browse the repository at this point in the history
  • Loading branch information
ueno committed Dec 28, 2011
1 parent 3f2bed3 commit ee2a6de
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 23 deletions.
28 changes: 14 additions & 14 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

SUBDIRS = \
src \
icons \
m4 \
po \
SUBDIRS = \
src \
icons \
m4 \
po \
$(NULL)

ACLOCAL_AMFLAGS = -I m4
Expand All @@ -40,10 +40,10 @@ skk.xml: skk.xml.in
eval "echo \"$${s}\""; \
) > $@

EXTRA_DIST = \
autogen.sh \
skk.xml.in.in \
ibus-skk.spec.in \
EXTRA_DIST = \
autogen.sh \
skk.xml.in.in \
ibus-skk.spec.in \
$(NULL)

GITIGNOREFILES = \
Expand All @@ -60,13 +60,13 @@ GITIGNOREFILES = \
mkinstalldirs \
$(NULL)

CLEANFILES = \
skk.xml \
CLEANFILES = \
skk.xml \
$(NULL)

DISTCLEANFILES = \
skk.xml.in \
po/stamp-it \
DISTCLEANFILES = \
skk.xml.in \
po/stamp-it \
$(NULL)

dist-hook:
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ m4_define([ibus_version],
ibus_major_version.ibus_minor_version.ibus_micro_version[]ibus_maybe_datestamp)

AC_INIT([package_name], [ibus_version], [http://github.com/ueno/ibus-skk/issues], [package_name])
AM_INIT_AUTOMAKE([1.10])
AM_INIT_AUTOMAKE([silent-rules])
AC_GNU_SOURCE

AC_CONFIG_HEADERS([config.h])
Expand Down
9 changes: 1 addition & 8 deletions icons/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
# 02110-1301 USA

icons_DATA = \
ibus-skk.svg \
$(NULL)

dist_icons_DATA = ibus-skk.svg
iconsdir = $(pkgdatadir)/icons

EXTRA_DIST = \
ibus-skk.svg \
$(NULL)

-include $(top_srcdir)/git.mk

0 comments on commit ee2a6de

Please sign in to comment.