aboutsummaryrefslogtreecommitdiffstats
path: root/e-util
diff options
context:
space:
mode:
Diffstat (limited to 'e-util')
-rw-r--r--e-util/ChangeLog8
-rw-r--r--e-util/Makefile.am11
-rw-r--r--e-util/ename/Makefile.am5
3 files changed, 8 insertions, 16 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index 72525f8f07..21014249b5 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,3 +1,11 @@
+2003-09-11 Dan Winship <danw@ximian.com>
+
+ * Makefile.am (noinst_LTLIBRARIES): Remove libeutil-static.la and
+ libeconduit-static.la
+
+ * ename/Makefile.am (noinst_LTLIBRARIES): Remove
+ libename-static.la
+
2003-08-28 Hans Petter Jansson <hpj@ximian.com>
* eggtrayicon.[ch]: Added for tray icon support. To be removed when
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index 1d09e140bb..61c49ed99c 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -16,7 +16,6 @@ INCLUDES = \
$(E_UTIL_CFLAGS)
privlib_LTLIBRARIES = libeutil.la libedb3util.la libeconduit.la
-noinst_LTLIBRARIES = libeutil-static.la libeconduit-static.la
eutilinclude_HEADERS = \
e-account-list.h \
@@ -93,13 +92,6 @@ MARSHAL_GENERATED = e-util-marshal.c e-util-marshal.h
libeutil_la_LIBADD = $(E_UTIL_LIBS)
-libeutil_static_la_SOURCES = $(libeutil_la_SOURCES)
-libeutil_static_la_LIBADD = $(libeutil_la_LIBADD)
-libeutil_static_la_LDFLAGS = -all-static
-# Make sure libeutil.la and libeutil-static.la are not built in
-# parallel when using a parallel make; libtool can't handle that.
-libeutil_static_la_DEPENDENCIES = libeutil.la
-
econdinclude_HEADERS = \
e-pilot-map.h \
e-pilot-settings.h \
@@ -119,9 +111,6 @@ endif
libeconduit_la_SOURCES = $(pilot_compile)
-libeconduit_static_la_SOURCES = $(libeconduit_la_SOURCES)
-libeconduit_static_la_LDFLAGS = -all-static
-
EXTRA_DIST = \
$(pilot_sources) \
ChangeLog.pre-1-4 \
diff --git a/e-util/ename/Makefile.am b/e-util/ename/Makefile.am
index 20ac03209b..1909e191ec 100644
--- a/e-util/ename/Makefile.am
+++ b/e-util/ename/Makefile.am
@@ -26,11 +26,6 @@ libenameinclude_HEADERS = \
e-name-western.h
-noinst_LTLIBRARIES = libename-static.la
-libename_static_la_SOURCES = $(libename_la_SOURCES)
-libename_static_la_LDFLAGS = --all-static
-
-
noinst_PROGRAMS = \
test-ename-western \
test-ename-western-gtk