From dff7aec3c3302c2191100ce22a8cf28959808c28 Mon Sep 17 00:00:00 2001
From: Ettore Perazzoli <ettore@src.gnome.org>
Date: Thu, 2 Mar 2000 00:08:15 +0000
Subject: Automakeize the `filter' directory.

I wonder why we ever have non-Automake stuff in the repository at all.

svn path=/trunk/; revision=2006
---
 filter/.cvsignore  |  4 +++-
 filter/ChangeLog   |  7 +++++++
 filter/Makefile    | 31 -------------------------------
 filter/Makefile.am | 41 +++++++++++++++++++++++++++++++++++++++++
 4 files changed, 51 insertions(+), 32 deletions(-)
 delete mode 100644 filter/Makefile
 create mode 100644 filter/Makefile.am

diff --git a/filter/.cvsignore b/filter/.cvsignore
index 2b7973a0bf..fbd0653ee5 100644
--- a/filter/.cvsignore
+++ b/filter/.cvsignore
@@ -1,5 +1,7 @@
-filter-editor
 *.la
 *.lo
 .libs
+Makefile
+Makefile.in
 filter-driver
+filter-editor
diff --git a/filter/ChangeLog b/filter/ChangeLog
index 8c2cf87268..b8445aee42 100644
--- a/filter/ChangeLog
+++ b/filter/ChangeLog
@@ -1,3 +1,10 @@
+2000-03-01  Ettore Perazzoli  <ettore@helixcode.com>
+
+	* Makefile.am: New file.
+
+	* Makefile: Removed.  I wonder why we are using plain Makefiles
+	instead of automake Makefiles at all.
+
 2000-02-29  NotZed  <NotZed@HelixCode.com>
 
 	* filter-driver.c (main): Remove gui code, this will be actual
diff --git a/filter/Makefile b/filter/Makefile
deleted file mode 100644
index e9b6311c6a..0000000000
--- a/filter/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-
-LIBFILTEROBJS = filter-arg-types.lo filter-arg.lo filter-xml.lo filter-format.lo filter-druid.lo filter-editor.lo
-LIBFILTERSRCS = filter-arg-types.c filter-arg.c filter-xml.c filter-format.c filter-druid.c filter-editor.c
-
-LIBTOOL=sh ../libtool
-#CC=insure gcc
-
-CFLAGS = `gnome-config --cflags xml gnome gtk gtkhtml gnomeui` -g \
-	-I .. -I../libibex -I../camel -I../e-util -I../camel/providers/mbox
-LDFLAGS = `gnome-config --libs xml gnome gtk gtkhtml gnomeui` \
-	../camel/libcamel.la ../e-util/libeutil.la
-
-all: libfilter.la filter-driver
-
-filter-editor: $(OBJS) filter-editor.lo libfilter.la
-	$(LIBTOOL) --mode link $(CC) $^ -o $@ $(LDFLAGS)
-
-filter-driver: $(OBJS) filter-driver.lo libfilter.la
-	$(LIBTOOL) --mode link $(CC) $^ -o $@ $(LDFLAGS)
-
-libfilter.la: $(LIBFILTEROBJS)
-	$(LIBTOOL) --mode link $(CC) -static $^ -o $@
-
-%.lo: %.c
-	$(LIBTOOL) --mode compile $(CC) $(CFLAGS) -c -o $@ $<
-
-install: 
-	echo "There is nothing to install"
-
-clean:
-	-rm -rf *.o *.lo core .libs
diff --git a/filter/Makefile.am b/filter/Makefile.am
new file mode 100644
index 0000000000..ba6632471a
--- /dev/null
+++ b/filter/Makefile.am
@@ -0,0 +1,41 @@
+INCLUDES = 					\
+	-I $(top_srcdir)			\
+	-I $(top_srcdir)/libibex		\
+	-I $(top_srcdir)/camel			\
+	-I $(top_srcdir)/e-util			\
+	-I $(top_srcdir)/camel/providers/mbox	\
+	-I $(GNOME_INCLUDEDIR)			\
+	-I $(GTKHTML_CFLAGS)
+
+##
+
+noinst_PROGRAMS =				\
+	filter-driver
+
+noinst_LTLIBRARIES =				\
+	libfilter.la
+
+##
+
+filter_driver_SOURCES = 			\
+	filter-driver.c
+
+filter_driver_LDADD = 				\
+	libfilter.la				\
+	../camel/libcamel.la			\
+	../e-util/libeutil.la			\
+	$(GNOME_LIBDIR)				\
+	$(GNOMEUI_LIBS)				\
+	$(INTLLIBS)				\
+	$(PTHREAD_LIB)				\
+	$(EXTRA_GNOME_LIBS)
+
+##
+
+libfilter_la_SOURCES =				\
+	filter-arg-types.c			\
+	filter-arg.c				\
+	filter-xml.c				\
+	filter-format.c				\
+	filter-druid.c				\
+	filter-editor.c
-- 
cgit v1.2.3