X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=Makefile.am;h=84f94b49afbad809ecb58de3b60dacd7766b7d47;hp=c4b2b017f4eb2346dcdab0a7412241e982c46d61;hb=adf8d7a9de5da50b7ee9c9d601c0258c830b38f0;hpb=cd62e027c0a3a8d97a6689d042b92699d8b619f3

diff --git a/Makefile.am b/Makefile.am
index c4b2b01..84f94b4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,10 @@
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-ACLOCAL_AMFLAGS = -I autostuff
+ACLOCAL_AMFLAGS = -I m4
+GNUMAKEFLAGS = --no-print-directory
+
+AM_CFLAGS = $(SC_EXTRA_CFLAGS) $(SC_WFLAGS) $(SIGROK_CLI_CFLAGS)
 
 bin_PROGRAMS = sigrok-cli
 
@@ -33,15 +36,26 @@ sigrok_cli_SOURCES = \
 	anykey.c \
 	options.c
 
+sigrok_cli_LDADD = $(SIGROK_CLI_LIBS)
+
 dist_man_MANS = doc/sigrok-cli.1
 
-EXTRA_DIST = contrib/sigrok-cli_cross.nsi 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:
-	git --git-dir $(top_srcdir)/.git log > ChangeLog || touch ChangeLog
+	git --git-dir '$(top_srcdir)/.git' log >$@ || touch $@
 
 dist-hook: ChangeLog