aboutsummaryrefslogtreecommitdiffstats
path: root/e-util
diff options
context:
space:
mode:
Diffstat (limited to 'e-util')
-rw-r--r--e-util/ChangeLog6
-rw-r--r--e-util/Makefile.am13
-rw-r--r--e-util/ename/Makefile.am23
3 files changed, 19 insertions, 23 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index 175d81e314..2987654442 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,3 +1,9 @@
+2002-01-27 Ettore Perazzoli <ettore@ximian.com>
+
+ * ename/Makefile.am: Use E_NAME_CFLAGS and E_NAME_LIBS.
+
+ * Makefile.am: Use E_UTIL_CFLAGS and E_UTIL_LIBS.
+
2002-01-14 JP Rosevear <jpr@ximian.com>
* Makefile.am: compile new files
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index 805ae03ea9..2eb4436515 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -3,16 +3,13 @@ SUBDIRS = . ename
imagesdir = $(datadir)/images/evolution
INCLUDES = \
- $(DB3_CFLAGS) \
-I$(top_srcdir) \
- $(GNOME_INCLUDEDIR) \
- $(EXTRA_GNOME_CFLAGS) \
- $(BONOBO_GNOME_CFLAGS) \
- $(BONOBO_CONF_CFLAGS) \
- $(PISOCK_CFLAGS) \
-DEVOLUTION_IMAGES=\""$(imagesdir)"\" \
-DEVOLUTION_CATEGORY_ICONS=\""$(imagesdir)/categories"\" \
- -DG_LOG_DOMAIN=\"e-utils\"
+ -DG_LOG_DOMAIN=\"e-utils\" \
+ $(DB3_CFLAGS) \
+ $(PISOCK_CFLAGS) \
+ $(E_UTIL_CFLAGS)
noinst_LTLIBRARIES = libeutil.la libeutil-static.la \
libeconduit.la libeconduit-static.la \
@@ -66,7 +63,7 @@ libeutil_la_SOURCES = \
md5-utils.c \
md5-utils.h
-libeutil_la_LIBADD = $(GAL_LIBS)
+libeutil_la_LIBADD = $(E_UTIL_LIBS)
libeutil_static_la_SOURCES = $(libeutil_la_SOURCES)
libeutil_static_la_LIBADD = $(libeutil_la_LIBADD)
diff --git a/e-util/ename/Makefile.am b/e-util/ename/Makefile.am
index b3abe633df..551399bc9f 100644
--- a/e-util/ename/Makefile.am
+++ b/e-util/ename/Makefile.am
@@ -7,17 +7,11 @@ INCLUDES = \
-I.. \
-I$(top_builddir) \
-I$(includedir) \
- $(GNOME_INCLUDEDIR) \
- $(EXTRA_GNOME_CFLAGS)
-
-gnome_libs = \
- $(BONOBO_GNOME_LIBS) \
- $(INTLLIBS) \
- $(EXTRA_GNOME_LIBS)
+ $(E_NAME_CFLAGS)
ename_libs = \
libename.la \
- $(gnome_libs)
+ $(E_NAME_LIBS)
lib_LTLIBRARIES = libename.la
@@ -38,20 +32,19 @@ libename_static_la_SOURCES = $(libename_la_SOURCES)
libename_static_la_LDFLAGS = --all-static
-noinst_PROGRAMS = \
- test-ename-western \
+noinst_PROGRAMS = \
+ test-ename-western \
test-ename-western-gtk
-test_ename_western_SOURCES = \
+test_ename_western_SOURCES = \
test-ename-western.c
-test_ename_western_LDADD = $(ename_libs) \
- $(EXTRA_GNOME_LIBS)
+test_ename_western_LDADD = \
+ $(ename_libs)
test_ename_western_gtk_SOURCES = \
test-ename-western-gtk.c
test_ename_western_gtk_LDADD = \
$(ename_libs) \
- $(top_builddir)/e-util/libeutil.la \
- $(gnome_libs)
+ $(top_builddir)/e-util/libeutil.la