From 737fca6bf3aefe89bfa665ff1f074e23b51bcff9 Mon Sep 17 00:00:00 2001
From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Fri, 16 Aug 2002 13:43:03 +0000
Subject: [PATCH] use $(variables) instead of @substitutions@ in Makefile.am:s

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5014 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/ChangeLog             | 13 +++++++++----
 src/Makefile.am           | 10 +++++-----
 src/frontends/ChangeLog   |  4 ++++
 src/frontends/Makefile.am |  6 +++---
 4 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index c81b1372e7..b38cb9012b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,10 +1,15 @@
+2002-08-16  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
+
+	* Makefile.am: use $(variables) instead of @substitutions@
+
+2002-08-15  André Pönitz <poenitz@gmx.net>
 	
-	*	lyxfunc.C:
-	  BufferView_pimpl.C: streamlining mathed <-> outer world interaction
+	* lyxfunc.C:
+	* BufferView_pimpl.C: streamlining mathed <-> outer world
+	interaction 
 
 	* commandtags.h:
-	  LyXAction.C: remove unused LFUN_MATH
-
+	* LyXAction.C: remove unused LFUN_MATH
 
 2002-08-15  Lars Gullik Bjønnes  <larsbj@gullik.net>
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 97eb887a5e..128391e177 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,13 +20,13 @@ BOOST_LIBS = ../boost/libs/regex/src/libboostregex.la \
 
 #lyx_DEPENDENCIES = $(LYX_CONV_LIBS) $(INCLUDED_SIGC)
 
-lyx_LDADD = $(LYX_CONV_LIBS) $(BOOST_LIBS) @INTLLIBS@ \
-	$(PSPELL_LIBS) @AIKSAURUS_LIBS@
+lyx_LDADD = $(LYX_CONV_LIBS) $(BOOST_LIBS) $(INTLLIBS) \
+	$(PSPELL_LIBS) $(AIKSAURUS_LIBS)
 
-#lyx_LDADD = $(LYX_CONV_LIBS) $(SIGC_LIBS) $(BOOST_LIBS) $(INCLUDED_SIGC) @INTLLIBS@ \
-#	$(PSPELL_LIBS) @AIKSAURUS_LIBS@
+#lyx_LDADD = $(LYX_CONV_LIBS) $(SIGC_LIBS) $(BOOST_LIBS) $(INCLUDED_SIGC) $(INTLLIBS) \
+#	$(PSPELL_LIBS) $(AIKSAURUS_LIBS)
 
-#  @FRONTEND_LDFLAGS@ @FRONTEND_LIBS@
+#  $(FRONTEND_LDFLAGS) $(FRONTEND_LIBS)
 
 #lyx_LDFLAGS=-Wl,-O1
 
diff --git a/src/frontends/ChangeLog b/src/frontends/ChangeLog
index 64306cfb2d..0ce12ca53b 100644
--- a/src/frontends/ChangeLog
+++ b/src/frontends/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-16  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
+
+	* Makefile.am: use $(variables) instead of @substitutions@
+
 2002-08-15  Angus Leeming  <leeming@lyx.org>
 
 	* Dialogs.[Ch]:
diff --git a/src/frontends/Makefile.am b/src/frontends/Makefile.am
index 7fb67b402b..abb7b8f6e1 100644
--- a/src/frontends/Makefile.am
+++ b/src/frontends/Makefile.am
@@ -1,15 +1,15 @@
 include $(top_srcdir)/config/common.am
 
-SUBDIRS = controllers @FRONTEND@
+SUBDIRS = controllers $(FRONTEND)
 
 DIST_SUBDIRS = controllers xforms qt2 gnome
 
 noinst_LTLIBRARIES = libfrontends.la
 
-LIBS += @FRONTEND_LDFLAGS@ @FRONTEND_LIBS@
+LIBS += $(FRONTEND_LDFLAGS) $(FRONTEND_LIBS)
 
 INCLUDES = $(FRONTEND_INCLUDES) -I$(srcdir)/..  $(SIGC_CFLAGS) $(BOOST_INCLUDES)
-libfrontends_la_LIBADD = @FRONTEND_GUILIB@ controllers/*.lo
+libfrontends_la_LIBADD = $(FRONTEND_GUILIB) controllers/*.lo
 
 libfrontends_la_DEPENDENCIES = $(libfrontends_la_LIBADD)