1 files changed, 15 insertions, 71 deletions

diff --git a/Makefile.am b/Makefile.am
index 6e46949..d711aec 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 # This file is part of ltrace.
-# Copyright (C) 2012 Petr Machata, Red Hat Inc.
+# Copyright (C) 2012, 2013 Petr Machata, Red Hat Inc.
 # Copyright (C) 2010 Marc Kleine-Budde, Pengutronix
 # Copyright (C) 2010 Zachary T Welch, CodeSourcery
 #
@@ -25,42 +25,15 @@ SUBDIRS = \
 	. \
 	testsuite
 
-AM_CPPFLAGS += \
-	$(libelf_CFLAGS) \
-	-DSYSCONFDIR=\"$(sysconfdir)\"
-
 noinst_LTLIBRARIES = \
 	libltrace.la
 
-libltrace_la_SOURCES = \
-	breakpoints.c \
-	debug.c \
-	demangle.c \
-	dict.c \
-	ltrace-elf.c \
-	execute_program.c \
-	handle_event.c \
-	libltrace.c \
-	options.c \
-	output.c \
-	proc.c \
-	read_config_file.c  \
-	summary.c \
-	library.c \
-	filter.c \
-	glob.c \
-	type.c \
-	value.c \
-	value_dict.c \
-	expr.c \
-	fetch.c \
-	vect.c \
-	param.c \
-	printf.c \
-	zero.c \
-	lens.c \
-	lens_default.c \
-	lens_enum.c
+libltrace_la_SOURCES = bits.c breakpoints.c debug.c demangle.c dict.c	\
+	ltrace-elf.c execute_program.c handle_event.c libltrace.c	\
+	options.c output.c proc.c read_config_file.c summary.c		\
+	library.c filter.c glob.c type.c value.c value_dict.c expr.c	\
+	fetch.c vect.c param.c printf.c zero.c lens.c lens_default.c	\
+	lens_enum.c memstream.c prototype.c
 
 libltrace_la_LIBADD = \
 	$(libelf_LIBS) \
@@ -70,7 +43,6 @@ libltrace_la_LIBADD = \
 	$(libunwind_LIBS) \
 	sysdeps/libos.la
 
-
 bin_PROGRAMS = \
 	ltrace
 
@@ -80,50 +52,22 @@ ltrace_SOURCES = \
 ltrace_LDADD = \
 	libltrace.la
 
-
-noinst_HEADERS = \
-	backend.h \
-	breakpoint.h \
-	common.h \
-	debug.h \
-	defs.h \
-	demangle.h \
-	dict.h \
-	forward.h \
-	ltrace-elf.h \
-	ltrace.h \
-	options.h \
-	output.h \
-	proc.h \
-	read_config_file.h \
-	library.h \
-	filter.h \
-	glob.h \
-	vect.h \
-	type.h \
-	value.h \
-	value_dict.h \
-	callback.h \
-	expr.h \
-	fetch.h \
-	vect.h \
-	param.h \
-	printf.h \
-	zero.h \
-	lens.h \
-	lens_default.h \
-	lens_enum.h
+noinst_HEADERS = bits.h backend.h breakpoint.h common.h debug.h		\
+	defs.h demangle.h dict.h forward.h ltrace-elf.h ltrace.h	\
+	options.h output.h proc.h read_config_file.h library.h		\
+	filter.h glob.h vect.h type.h value.h value_dict.h callback.h	\
+	expr.h fetch.h vect.h param.h printf.h zero.h lens.h		\
+	lens_default.h lens_enum.h memstream.h prototype.h
 
 dist_man1_MANS = ltrace.1
 dist_man5_MANS = ltrace.conf.5
 
 dist_doc_DATA = COPYING CREDITS INSTALL README TODO
 
-dist_sysconf_DATA = \
-	etc/ltrace.conf
+dist_pkgdata_DATA = etc/syscalls.conf etc/libc.so.conf	\
+	etc/libm.so.conf etc/libacl.so.conf
 
 EXTRA_DIST = \
-	ltrace.spec \
 	debian/changelog \
 	debian/compat \
 	debian/control \