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
This commit is contained in:
Jean-Marc Lasgouttes 2002-08-16 13:43:03 +00:00
parent d0835fa4ca
commit 737fca6bf3
4 changed files with 21 additions and 12 deletions

View File

@ -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>

View File

@ -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

View File

@ -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]:

View File

@ -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)