Remove redundant entry from .desktop file

[disorder] / disobedience / Makefile.am

diff --git a/disobedience/Makefile.am b/disobedience/Makefile.am
index bf5ea40..2328bca 100644 (file)
--- a/disobedience/Makefile.am
+++ b/disobedience/Makefile.am
@@ -1,6 +1,6 @@
 #
 # This file is part of DisOrder.
-# Copyright (C) 2006-2010 Richard Kettlewell
+# Copyright (C) 2006-2013 Richard Kettlewell
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,6 +19,7 @@
 bin_PROGRAMS=disobedience
 SUBDIRS=manual
 
+AUTOMAKE_OPTIONS=subdir-objects
 AM_CPPFLAGS=-I${top_srcdir}/lib -I../lib
 AM_CFLAGS=$(GLIB_CFLAGS) $(GTK_CFLAGS)
 
@@ -30,13 +31,33 @@ disobedience_SOURCES=disobedience.h disobedience.c client.c queue.c \
        popup.h playlists.c multidrag.c multidrag.h autoscroll.c        \
        autoscroll.h globals.c
 disobedience_LDADD=../lib/libdisorder.a $(LIBPCRE) $(LIBGC) $(LIBGCRYPT) \
-       $(LIBASOUND) $(COREAUDIO) $(LIBDB) $(LIBICONV)
+       $(LIBASOUND) $(COREAUDIO) $(LIBICONV) -lm \
+       $(PULSEAUDIO_SIMPLE_LIBS) $(PULSEAUDIO_LIBS)
 disobedience_LDFLAGS=$(GTK_LIBS)
 
+install-data-local:
+       $(MKDIR_P) ${DESTDIR}${datarootdir}/applications
+       $(INSTALL) -m 644 ${srcdir}/disobedience.desktop \
+               ${DESTDIR}${datarootdir}/applications/disobedience.desktop
+       $(MKDIR_P) ${DESTDIR}${datarootdir}/icons/hicolor/48x48/apps
+       $(INSTALL) -m 644 ${top_srcdir}/images/disobedience48x48.png \
+               ${DESTDIR}${datarootdir}/icons/hicolor/48x48/apps/disobedience.png
+       $(MKDIR_P) ${DESTDIR}${datarootdir}/icons/hicolor/64x64/apps
+       $(INSTALL) -m 644 ${top_srcdir}/images/disobedience64x64.png \
+               ${DESTDIR}${datarootdir}/icons/hicolor/64x64/apps/disobedience.png
+       $(MKDIR_P) ${DESTDIR}${datarootdir}/icons/hicolor/128x128/apps
+       $(INSTALL) -m 644 ${top_srcdir}/images/disobedience128x128.png \
+               ${DESTDIR}${datarootdir}/icons/hicolor/128x128/apps/disobedience.png
+       $(MKDIR_P) ${DESTDIR}${datarootdir}/icons/hicolor/256x256/apps
+       $(INSTALL) -m 644 ${top_srcdir}/images/disobedience256x256.png \
+               ${DESTDIR}${datarootdir}/icons/hicolor/256x256/apps/disobedience.png
+
 check: check-help
 
 misc.o: ../images/images.h
 
+EXTRA_DIST=disobedience.desktop
+
 # check everything has working --help
 check-help: all
        unset DISPLAY;./disobedience --version > /dev/null