From d4bf4d0179d9a98868dc7db8780260d418b860e7 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Fri, 15 Mar 2002 16:14:15 +0000 Subject: [PATCH] link fix for cygwin from Kayvan git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3759 a592a061-630c-0410-9148-cb99ea01b6c8 --- ChangeLog | 5 +++++ configure.in | 2 +- src/ChangeLog | 5 +++++ src/Makefile.am | 2 +- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 20fef2c208..b4b8a86054 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-03-14 Kayvan A. Sylvan + + * configure.in: Fix order of -lXpm and -lforms for + Cygwin linker. + 2002-03-15 Jean-Marc Lasgouttes * configure.in: small cleanups diff --git a/configure.in b/configure.in index a2228f24cf..88bf2ac91d 100644 --- a/configure.in +++ b/configure.in @@ -189,7 +189,7 @@ case "$lyx_use_frontend" in FRONTEND="xforms" FRONTEND_GUILIB="xforms/*.lo" FRONTEND_INCLUDES="-I\$(srcdir)/xforms" - FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@" + FRONTEND_LIBS="@XFORMS_LIB@ @XPM_LIB@" FRONTEND_INFO=`cat < + + * Makefile.am (lyx_DEPENDENCIES): Swap the order of libfrontend + and libgraphics to build on Cygwin. + 2002-03-15 Juergen Vigna * CutAndPaste.C (SwitchLayoutsBetweenClasses): fix the wrong use of diff --git a/src/Makefile.am b/src/Makefile.am index b557f1e1c8..060ce6970b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -9,8 +9,8 @@ SUBDIRS = mathed insets graphics support frontends bin_PROGRAMS = lyx lyx_DEPENDENCIES = mathed/libmathed.o insets/libinsets.o \ - graphics/libgraphics.o \ frontends/libfrontends.o \ + graphics/libgraphics.o \ support/libsupport.o \ @INCLUDED_SIGC@ -- 2.39.5