From cfe7876a433559cf2ce03b3cf86a7572c603b98b Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 8 Jun 2004 23:51:43 +0000
Subject: some stuff

git-svn-id: file:///home/lennart/svn/public/fieryfilter/trunk@34 79e6afc9-17da-0310-ae3c-b873bff394f4
---
 daemon/Makefile.am | 42 +++++++++++++++++++-----------------------
 1 file changed, 19 insertions(+), 23 deletions(-)

(limited to 'daemon/Makefile.am')

diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 66f66b2..1bc2633 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -1,11 +1,20 @@
-EXTRA_DIST = libdaemon
-
-CFLAGS+=-g -Wall -pipe
-
-INCLUDES = \
-	-I/usr/include/libipq \
-	-Ilibdaemon/src \
-	@PACKAGE_CFLAGS@
+# $Id: Makefile.am 25 2004-01-10 00:32:50Z lennart $
+#
+# This file is part of fieryfilter.
+#
+# fieryfilter is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# fieryfilter is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with fieryfilter; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
 
 sbin_PROGRAMS = fieryfilterd
 
@@ -17,18 +26,5 @@ fieryfilterd_SOURCES = \
 	packet.h packet.c \
 	common.h
 
-fieryfilterd_LDADD = @PACKAGE_LIBS@ /usr/lib/libipq.a libdaemon/src/libdaemon.a
-
-dist-hook:
-	test -f libdaemon/Makefile && $(MAKE) -C libdaemon/ distclean || true
-
-copy:
-	rm -rf libdaemon/
-	tar xzf ../../libdaemon/libdaemon-0.1.tar.gz &&	mv libdaemon-0.1 libdaemon
-
-libdaemon/src/libdaemon.a:
-	$(MAKE) -C libdaemon/
-
-.PHONY: copy
-
-
+fieryfilterd_LDADD = $(LIBDAEMON_LIBS) $(LIBIPQ_LIBS)
+fieryfilterd_CFLAGS = $(LIBDAEMON_CFLAGS) $(LIBIPQ_CFLAGS) $(AM_CFLAGS)
-- 
cgit