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

diff --git a/Makefile.am b/Makefile.am
index 9e10e5c..84f94b4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 ##
-## This file is part of the sigrok project.
+## This file is part of the sigrok-cli project.
 ##
-## Copyright (C) 2010 Bert Vermeulen <bert@biot.com>
+## Copyright (C) 2013 Bert Vermeulen <bert@biot.com>
 ##
 ## 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
@@ -17,19 +17,45 @@
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-ACLOCAL_AMFLAGS = -I autostuff
+ACLOCAL_AMFLAGS = -I m4
+GNUMAKEFLAGS = --no-print-directory
 
-SUBDIRS = contrib doc
+AM_CFLAGS = $(SC_EXTRA_CFLAGS) $(SC_WFLAGS) $(SIGROK_CLI_CFLAGS)
 
 bin_PROGRAMS = sigrok-cli
 
-sigrok_cli_SOURCES = sigrok-cli.c sigrok-cli.h parsers.c anykey.c
+sigrok_cli_SOURCES = \
+	main.c \
+	show.c \
+	device.c \
+	session.c \
+	input.c \
+	decode.c \
+	sigrok-cli.h \
+	parsers.c \
+	anykey.c \
+	options.c
+
+sigrok_cli_LDADD = $(SIGROK_CLI_LIBS)
+
+dist_man_MANS = doc/sigrok-cli.1
+
+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