--list-serial: Reduce indentation level.

[sigrok-cli.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d685d775e24b6697b5a7f0034feed520bf6af988..84f94b49afbad809ecb58de3b60dacd7766b7d47 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,6 @@
 ACLOCAL_AMFLAGS = -I m4
 GNUMAKEFLAGS = --no-print-directory
 
 ACLOCAL_AMFLAGS = -I m4
 GNUMAKEFLAGS = --no-print-directory
 

-AM_CPPFLAGS = -D_POSIX_C_SOURCE=200112L

 AM_CFLAGS = $(SC_EXTRA_CFLAGS) $(SC_WFLAGS) $(SIGROK_CLI_CFLAGS)
 
 bin_PROGRAMS = sigrok-cli
 AM_CFLAGS = $(SC_EXTRA_CFLAGS) $(SC_WFLAGS) $(SIGROK_CLI_CFLAGS)
 
 bin_PROGRAMS = sigrok-cli


@@ -41,13 +40,22 @@ sigrok_cli_LDADD = $(SIGROK_CLI_LIBS)
 
 dist_man_MANS = doc/sigrok-cli.1
 
 
 dist_man_MANS = doc/sigrok-cli.1
 

-EXTRA_DIST = contrib/sigrok-logo-notext.ico
+desktopdir = @datadir@/applications
+desktop_DATA = contrib/org.sigrok.sigrok-cli.desktop
+
+hicolor_icondir = @datadir@/icons/hicolor/scalable/apps
+hicolor_icon_DATA = contrib/sigrok-cli.svg
+
+EXTRA_DIST = \
+       contrib/sigrok-logo-notext.ico \
+       contrib/org.sigrok.sigrok-cli.desktop \
+       contrib/sigrok-cli.svg

 
 MAINTAINERCLEANFILES = ChangeLog
 
 .PHONY: ChangeLog
 ChangeLog:
 
 MAINTAINERCLEANFILES = ChangeLog
 
 .PHONY: ChangeLog
 ChangeLog:

-       git --git-dir $(top_srcdir)/.git log > ChangeLog || touch ChangeLog
+       git --git-dir '$(top_srcdir)/.git' log >$@ || touch $@

 
 dist-hook: ChangeLog
 
 
 dist-hook: ChangeLog