link fix for cygwin from Kayvan

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3759 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index 20fef2c208ac7bb0261a6541a9a120156f6e9468..b4b8a860548c07a57ff08a5c6c471cfb461660d4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-14  Kayvan A. Sylvan  <kayvan@sylvan.com>
+
+       * configure.in: Fix order of -lXpm and -lforms for
+       Cygwin linker.
+
 2002-03-15  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
 
        * configure.in: small cleanups

diff --git a/configure.in b/configure.in
index a2228f24cff39563576fd7235badb9dd71f524ff..88bf2ac91d4f6a61a079e04fa3b9313f6fc509ce 100644 (file)
--- 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 <<EOF
     libXpm version:               ${XPM_VERSION}\n\
     libforms version:             ${XFORMS_VERSION}\n

diff --git a/src/ChangeLog b/src/ChangeLog
index ba6045245aa6579f9370511e0a628f7be94fb9f8..feae4c52d9186fb780f2815fb75199a012561501 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-14  Kayvan A. Sylvan  <kayvan@sylvan.com>
+
+       * Makefile.am (lyx_DEPENDENCIES): Swap the order of libfrontend
+       and libgraphics to build on Cygwin.
+
 2002-03-15  Juergen Vigna  <jug@sad.it>
 
        * CutAndPaste.C (SwitchLayoutsBetweenClasses): fix the wrong use of

diff --git a/src/Makefile.am b/src/Makefile.am
index b557f1e1c8d6551bded71415c0349f1219f897aa..060ce6970b7bb1879292ceeb7b65dd6c67cd8ccc 100644 (file)
--- 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@