From f133142418b461a4b0a076c40bd6c5bf4bbd2714 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Tue, 11 Jan 2000 17:44:32 +0000 Subject: [PATCH] revert to using .la type libtool libs git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@416 a592a061-630c-0410-9148-cb99ea01b6c8 --- ChangeLog | 8 ++++++++ src/Makefile.am | 2 +- src/insets/Makefile.am | 4 ++-- src/mathed/Makefile.am | 4 ++-- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index d2817af563..211ae75ce9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2000-01-11 Lars Gullik Bjønnes + + * src/mathed/Makefile.am (noinst_LTLIBRARIES): use .la + + * src/insets/Makefile.am (noinst_LTLIBRARIES): use .la + + * src/Makefile.am (lyx_DEPENDENCIES): switch back to .la libs + 2000-01-11 Jean-Marc Lasgouttes * src/paragraph.C (BreakParagraph): do not reserve space on text diff --git a/src/Makefile.am b/src/Makefile.am index beeb0db15a..e8c02bc2ab 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,7 +3,7 @@ SUBDIRS = mathed insets support DISTCLEANFILES = libintl.h config.h MAINTAINERCLEANFILES = Makefile.in config.h.in bin_PROGRAMS = lyx -lyx_DEPENDENCIES = mathed/libmathed.o insets/libinsets.o support/libsupport.la +lyx_DEPENDENCIES = mathed/libmathed.la insets/libinsets.la support/libsupport.la lyx_LDADD = $(lyx_DEPENDENCIES) @INTLLIBS@ $(LYX_LIBS) EXTRA_DIST = config.h.in stamp-h.in cheaders ETAGS_ARGS = --c++ diff --git a/src/insets/Makefile.am b/src/insets/Makefile.am index 46a10ba968..cb0e3b132f 100644 --- a/src/insets/Makefile.am +++ b/src/insets/Makefile.am @@ -1,11 +1,11 @@ AUTOMAKE_OPTIONS = foreign MAINTAINERCLEANFILES = Makefile.in -noinst_LTLIBRARIES = libinsets.o +noinst_LTLIBRARIES = libinsets.la LIBS = ETAGS_ARGS = --c++ INCLUDES = -I${srcdir}/../ -libinsets_o_SOURCES = \ +libinsets_la_SOURCES = \ figinset.C \ figinset.h \ form_url.C \ diff --git a/src/mathed/Makefile.am b/src/mathed/Makefile.am index b43390441c..791fe931cc 100644 --- a/src/mathed/Makefile.am +++ b/src/mathed/Makefile.am @@ -1,11 +1,11 @@ AUTOMAKE_OPTIONS = foreign 1.4 MAINTAINERCLEANFILES = Makefile.in -noinst_LTLIBRARIES = libmathed.o +noinst_LTLIBRARIES = libmathed.la LIBS= ETAGS_ARGS = --c++ INCLUDES = -I${top_srcdir}/images -I${srcdir}/../ -libmathed_o_SOURCES = array.h \ +libmathed_la_SOURCES = array.h \ formula.C \ formula.h \ formulamacro.C \ -- 2.39.5