diff options
author | TingPing <tingping@tingping.se> | 2012-12-17 16:48:52 -0500 |
---|---|---|
committer | TingPing <tingping@tingping.se> | 2012-12-17 16:48:52 -0500 |
commit | 616b88eea1a132f0c962cfc26e4dbbf5ff561ab8 (patch) | |
tree | 2147d668f47a7d24573569de3e8093a130bf7219 | |
parent | af9b65ee7807452cce04d94a7f8436dce8e9475f (diff) | |
parent | 49f268d71ec235cd7659c53511440a6ebe6f98b7 (diff) |
Merge branch 'master' of github.com:hexchat/hexchat
-rw-r--r-- | Makefile.am | 8 | ||||
-rw-r--r-- | configure.ac | 3 | ||||
-rw-r--r-- | share/Makefile.am | 1 | ||||
-rw-r--r-- | share/icons/Makefile.am | 13 | ||||
-rw-r--r-- | share/misc/Makefile.am | 3 |
5 files changed, 21 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index 40ed64e9..91ca9d79 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,13 +1,7 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS = po intl src plugins man +SUBDIRS = po intl src plugins man share EXTRA_DIST = autogen.sh -icon_DATA = src/pixmaps/hexchat.png -icondir = $(datadir)/pixmaps - -util_DATA = share/misc/hexchat.desktop -utildir = $(datadir)/applications - ACLOCAL_AMFLAGS = -I m4 diff --git a/configure.ac b/configure.ac index 66f698d3..5e129180 100644 --- a/configure.ac +++ b/configure.ac @@ -950,6 +950,9 @@ AC_SUBST(hexchatlibdir) AC_OUTPUT([ Makefile +share/Makefile +share/icons/Makefile +share/misc/Makefile src/Makefile src/common/Makefile src/common/dbus/Makefile diff --git a/share/Makefile.am b/share/Makefile.am new file mode 100644 index 00000000..f265b88e --- /dev/null +++ b/share/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = icons misc diff --git a/share/icons/Makefile.am b/share/icons/Makefile.am new file mode 100644 index 00000000..ee5384cc --- /dev/null +++ b/share/icons/Makefile.am @@ -0,0 +1,13 @@ +icon_DATA = ../../src/pixmaps/hexchat.png +icondir = $(datadir)/icons/hicolor/48x48/apps + +hicolor_DATA = hexchat.svg +hicolordir = $(datadir)/icons/hicolor/scalable/apps + +UPDATE_ICON_CACHE = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor + +install-data-hook: + $(UPDATE_ICON_CACHE); + +uninstall-hook: + $(UPDATE_ICON_CACHE); diff --git a/share/misc/Makefile.am b/share/misc/Makefile.am new file mode 100644 index 00000000..eec37250 --- /dev/null +++ b/share/misc/Makefile.am @@ -0,0 +1,3 @@ +util_DATA = hexchat.desktop +utildir = $(datadir)/applications + |