Add new Makefiles to Makefile list.

2000-02-09  Christopher James Lahey  <clahey@helixcode.com>

        * configure.in: Add new Makefiles to Makefile list.

        * e-util/Makefile.am: Add canvas utilities to libeutil.

        * widgets/e-text/Makefile.am: Build libetext.

        * widgets/e-minicard/Makefile.am: Build libeminicard and test
        programs.

        * widgets/Makefile.am: Remove all e-text and e-minicard code and
        add them to the SUBDIRS list.

svn path=/trunk/; revision=1706

8 files changed, 176 insertions, 54 deletions

diff --git a/ChangeLog b/ChangeLog
index 4a2e0d1c18..f540ef5e10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2000-02-09  Christopher James Lahey  <clahey@helixcode.com>
+
+	* configure.in: Add new Makefiles to Makefile list.
+
+	* e-util/Makefile.am: Add canvas utilities to libeutil.
+
+	* widgets/e-text/Makefile.am: Build libetext.
+
+	* widgets/e-minicard/Makefile.am: Build libeminicard and test
+	programs.
+
+	* widgets/Makefile.am: Remove all e-text and e-minicard code and
+	add them to the SUBDIRS list.
+
 2000-02-08  Matt Loper  <matt.loper@splashtech.com>
 
 	* tests/ui-tests/message-browser.c: New file; shows a message in
diff --git a/addressbook/gui/minicard/Makefile.am b/addressbook/gui/minicard/Makefile.am
new file mode 100644
index 0000000000..0790577ad1
--- /dev/null
+++ b/addressbook/gui/minicard/Makefile.am
@@ -0,0 +1,47 @@
+INCLUDES =					\
+	-I$(top_srcdir)/widgets/e-text		\
+	-I$(top_srcdir)/e-util			\
+	$(GNOME_INCLUDEDIR)
+
+noinst_LIBRARIES =				\
+	libeminicard.a
+
+libeminicard_a_SOURCES = 		\
+	e-minicard.c				\
+	e-minicard.h				\
+	e-minicard-label.c			\
+	e-minicard-label.h			\
+	e-reflow.c				\
+	e-reflow.h
+
+noinst_PROGRAMS =	\
+	minicard-label-test	\
+	minicard-test		\
+	reflow-test
+
+minicard_label_test_SOURCES = 	\
+	test-minicard-label.c
+
+minicard_label_test_LDADD =	\
+	$(EXTRA_GNOME_LIBS)	\
+	libeminicard.a		\
+	$(top_builddir)/e-util/libeutil.a	\
+	$(top_builddir)/widgets/e-text/libetext.a
+
+minicard_test_SOURCES = 	\
+	test-minicard.c
+
+minicard_test_LDADD =	\
+	$(EXTRA_GNOME_LIBS)	\
+	libeminicard.a	\
+	$(top_builddir)/e-util/libeutil.a	\
+	$(top_builddir)/widgets/e-text/libetext.a
+
+reflow_test_SOURCES = 	\
+	test-reflow.c
+
+reflow_test_LDADD =	\
+	$(EXTRA_GNOME_LIBS)	\
+	libeminicard.a	\
+	$(top_builddir)/e-util/libeutil.a	\
+	$(top_builddir)/widgets/e-text/libetext.a
diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am
new file mode 100644
index 0000000000..0790577ad1
--- /dev/null
+++ b/addressbook/gui/widgets/Makefile.am
@@ -0,0 +1,47 @@
+INCLUDES =					\
+	-I$(top_srcdir)/widgets/e-text		\
+	-I$(top_srcdir)/e-util			\
+	$(GNOME_INCLUDEDIR)
+
+noinst_LIBRARIES =				\
+	libeminicard.a
+
+libeminicard_a_SOURCES = 		\
+	e-minicard.c				\
+	e-minicard.h				\
+	e-minicard-label.c			\
+	e-minicard-label.h			\
+	e-reflow.c				\
+	e-reflow.h
+
+noinst_PROGRAMS =	\
+	minicard-label-test	\
+	minicard-test		\
+	reflow-test
+
+minicard_label_test_SOURCES = 	\
+	test-minicard-label.c
+
+minicard_label_test_LDADD =	\
+	$(EXTRA_GNOME_LIBS)	\
+	libeminicard.a		\
+	$(top_builddir)/e-util/libeutil.a	\
+	$(top_builddir)/widgets/e-text/libetext.a
+
+minicard_test_SOURCES = 	\
+	test-minicard.c
+
+minicard_test_LDADD =	\
+	$(EXTRA_GNOME_LIBS)	\
+	libeminicard.a	\
+	$(top_builddir)/e-util/libeutil.a	\
+	$(top_builddir)/widgets/e-text/libetext.a
+
+reflow_test_SOURCES = 	\
+	test-reflow.c
+
+reflow_test_LDADD =	\
+	$(EXTRA_GNOME_LIBS)	\
+	libeminicard.a	\
+	$(top_builddir)/e-util/libeutil.a	\
+	$(top_builddir)/widgets/e-text/libetext.a
diff --git a/configure.in b/configure.in
index 592c5bf9fd..c76f3fd07d 100644
--- a/configure.in
+++ b/configure.in
@@ -178,6 +178,8 @@ devel-docs/camel/Makefile
 tests/Makefile
 tests/ui-tests/Makefile
 widgets/Makefile
+widgets/e-text/Makefile
+widgets/e-minicard/Makefile
 widgets/meeting-time-sel/Makefile
 widgets/shortcut-bar/Makefile
 widgets/e-table/Makefile
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index d920da1fd4..f81b2da282 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -4,8 +4,12 @@ INCLUDES =					\
 noinst_LIBRARIES = libeutil.a
 
 libeutil_a_SOURCES = \
+	e-canvas.c	\
+	e-canvas.h	\
+	e-canvas-utils.c\
+	e-canvas-utils.h\
 	e-cursors.c	\
 	e-cursors.h	\
 	e-gui-utils.c	\
 	e-gui-utils.h	\
-	e-util.h
\ No newline at end of file
+	e-util.h
diff --git a/widgets/Makefile.am b/widgets/Makefile.am
index a826550575..5d052b11a0 100644
--- a/widgets/Makefile.am
+++ b/widgets/Makefile.am
@@ -1,55 +1,3 @@
 
 SUBDIRS =	\
-	meeting-time-sel shortcut-bar e-table
-
-INCLUDES =					\
-	-I$(top_srcdir)/camel			\
-	-I$(top_builddir)/camel			\
-	$(GNOME_INCLUDEDIR)
-
-noinst_LIBRARIES =				\
-	libevolutionwidgets.a
-
-libevolutionwidgets_a_SOURCES = 		\
-	e-canvas.c				\
-	e-canvas.h				\
-	e-canvas-utils.c			\
-	e-canvas-utils.h			\
-	e-minicard.c				\
-	e-minicard.h				\
-	e-minicard-label.c			\
-	e-minicard-label.h			\
-	e-reflow.c				\
-	e-reflow.h				\
-	e-text.c				\
-	e-text.h				\
-	e-text-event-processor.c		\
-	e-text-event-processor.h		\
-	e-text-event-processor-emacs-like.c	\
-	e-text-event-processor-emacs-like.h
-
-noinst_PROGRAMS =	\
-	minicard-label-test	\
-	minicard-test		\
-	reflow-test
-
-minicard_label_test_SOURCES = 	\
-	test-minicard-label.c
-
-minicard_label_test_LDADD =	\
-	$(EXTRA_GNOME_LIBS)	\
-	libevolutionwidgets.a	
-
-minicard_test_SOURCES = 	\
-	test-minicard.c
-
-minicard_test_LDADD =	\
-	$(EXTRA_GNOME_LIBS)	\
-	libevolutionwidgets.a	
-
-reflow_test_SOURCES = 	\
-	test-reflow.c
-
-reflow_test_LDADD =	\
-	$(EXTRA_GNOME_LIBS)	\
-	libevolutionwidgets.a	
+	e-text e-minicard meeting-time-sel shortcut-bar e-table
diff --git a/widgets/e-minicard/Makefile.am b/widgets/e-minicard/Makefile.am
new file mode 100644
index 0000000000..0790577ad1
--- /dev/null
+++ b/widgets/e-minicard/Makefile.am
@@ -0,0 +1,47 @@
+INCLUDES =					\
+	-I$(top_srcdir)/widgets/e-text		\
+	-I$(top_srcdir)/e-util			\
+	$(GNOME_INCLUDEDIR)
+
+noinst_LIBRARIES =				\
+	libeminicard.a
+
+libeminicard_a_SOURCES = 		\
+	e-minicard.c				\
+	e-minicard.h				\
+	e-minicard-label.c			\
+	e-minicard-label.h			\
+	e-reflow.c				\
+	e-reflow.h
+
+noinst_PROGRAMS =	\
+	minicard-label-test	\
+	minicard-test		\
+	reflow-test
+
+minicard_label_test_SOURCES = 	\
+	test-minicard-label.c
+
+minicard_label_test_LDADD =	\
+	$(EXTRA_GNOME_LIBS)	\
+	libeminicard.a		\
+	$(top_builddir)/e-util/libeutil.a	\
+	$(top_builddir)/widgets/e-text/libetext.a
+
+minicard_test_SOURCES = 	\
+	test-minicard.c
+
+minicard_test_LDADD =	\
+	$(EXTRA_GNOME_LIBS)	\
+	libeminicard.a	\
+	$(top_builddir)/e-util/libeutil.a	\
+	$(top_builddir)/widgets/e-text/libetext.a
+
+reflow_test_SOURCES = 	\
+	test-reflow.c
+
+reflow_test_LDADD =	\
+	$(EXTRA_GNOME_LIBS)	\
+	libeminicard.a	\
+	$(top_builddir)/e-util/libeutil.a	\
+	$(top_builddir)/widgets/e-text/libetext.a
diff --git a/widgets/e-text/Makefile.am b/widgets/e-text/Makefile.am
new file mode 100644
index 0000000000..ec7795f283
--- /dev/null
+++ b/widgets/e-text/Makefile.am
@@ -0,0 +1,13 @@
+INCLUDES =					\
+	$(GNOME_INCLUDEDIR)
+
+noinst_LIBRARIES =				\
+	libetext.a
+
+libetext_a_SOURCES = 		\
+	e-text.c				\
+	e-text.h				\
+	e-text-event-processor.c		\
+	e-text-event-processor.h		\
+	e-text-event-processor-emacs-like.c	\
+	e-text-event-processor-emacs-like.h