From 19e5557aa2f562bc15e1311996c78221f4b444ce Mon Sep 17 00:00:00 2001
From: joq <joq@0c269be4-1314-0410-8aa9-9f06e86f4224>
Date: Sat, 8 Nov 2003 15:47:24 +0000
Subject: [PATCH] [0.89.10] regress jackd/Makefile.am

git-svn-id: svn+ssh://jackaudio.org/trunk/jack@560 0c269be4-1314-0410-8aa9-9f06e86f4224
---
 configure.in      |  2 +-
 jackd/Makefile.am | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/configure.in b/configure.in
index 5915b8b..e98eeac 100644
--- a/configure.in
+++ b/configure.in
@@ -15,7 +15,7 @@ dnl                 changes are made
 dnl ---
 JACK_MAJOR_VERSION=0
 JACK_MINOR_VERSION=89
-JACK_MICRO_VERSION=9
+JACK_MICRO_VERSION=10
 
 dnl ---
 dnl HOWTO: updating the jack protocal version
diff --git a/jackd/Makefile.am b/jackd/Makefile.am
index 4bd320f..4f845c4 100644
--- a/jackd/Makefile.am
+++ b/jackd/Makefile.am
@@ -1,6 +1,7 @@
 MAINTAINERCLEANFILES = Makefile.in jackd.1 jack_md5.h 
 
 if USE_CAPABILITIES
+CAP_PROGS = jackstart
 CAP_LIBS = -lcap
 install-exec-hook:
 	if [ "`id -u`" = "0" ]; \
@@ -12,26 +13,22 @@ install-exec-hook:
 			echo " for jackd and jackstart."; \
 	fi
 else
+CAP_PROGS =
 CAP_LIBS =
 install-exec-hook:
 	@echo "Nothing to make for $@."
 endif
 
-if USE_CAPABILITIES
-bin_PROGRAMS = jackd jackstart
-else
-bin_PROGRAMS = jackd
-endif
+bin_PROGRAMS = jackd $(CAP_PROGS)
 
 AM_CFLAGS = $(JACK_CFLAGS) -DJACKD_LOCATION=\"$(bindir)/jackd\"
 
 jackd_SOURCES = jackd.c engine.c transengine.c
 jackd_LDADD = ../libjack/libjack.la -lm -ldl -lrt -lpthread $(CAP_LIBS)
 
-jackstart_SOURCES = jack_md5.h jackstart.c md5.c
-jackstart_LDFLAGS = $(CAP_LIBS)
+noinst_HEADERS = jack_md5.h md5.h md5_loc.h transengine.h
 
-noinst_HEADERS = md5.h md5_loc.h transengine.h
+BUILT_SOURCES = jack_md5.h
 
 jack_md5.h: jackd
 if STRIPPED_JACKD
@@ -39,6 +36,9 @@ if STRIPPED_JACKD
 endif
 	echo "#define JACKD_MD5_SUM \"`md5sum .libs/jackd | awk '{print $$1}'`\"" > jack_md5.h
 
+jackstart_SOURCES = jackstart.c md5.c
+jackstart_LDFLAGS = -lcap
+
 man_MANS = jackd.1 jackstart.1
 EXTRA_DIST = $(man_MANS)