anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 10:00:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

revert r34090 for now; I will come back later to this

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34133 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2010-04-14 14:25:11 +00:00
parent fb43bbbf6c
commit 14a96ce182
2 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@ -26,7 +26,7 @@ fi
AM_MAINTAINER_MODE
save_PACKAGE=$PACKAGE
AM_INIT_AUTOMAKE([foreign dist-bzip2 no-define subdir-objects 1.8])
AM_INIT_AUTOMAKE([foreign dist-bzip2 no-define 1.8])
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
PACKAGE=$save_PACKAGE
@ -67,7 +67,6 @@ AC_C_BIGENDIAN
LYX_USE_FRONTENDS
### Check for a C++ compiler
AM_PROG_CC_C_O
LYX_PROG_CXX
### Objective-C compiler

34
src/Makefile.am
View File

@ -23,11 +23,11 @@ bin_PROGRAMS = lyx
lyx_LDADD = \
liblyxcore.a \
mathed/liblyxmathed.a \
insets/liblyxinsets.a \
liblyxmathed.a \
liblyxinsets.a \
frontends/liblyxfrontends.a \
frontends/qt4/liblyxqt4.a \
graphics/liblyxgraphics.a \
liblyxgraphics.a \
support/liblyxsupport.a \
$(OTHERLIBS) \
$(QT4_LDFLAGS) \
@ -321,9 +321,9 @@ liblyxcore_a_DEPENDENCIES = $(MOCEDFILES)
############################### Graphics ##############################
noinst_LIBRARIES += graphics/liblyxgraphics.a
noinst_LIBRARIES += liblyxgraphics.a
graphics_liblyxgraphics_a_SOURCES = \
liblyxgraphics_a_SOURCES = \
graphics/GraphicsCache.h \
graphics/GraphicsCache.cpp \
graphics/GraphicsCacheItem.h \
@ -348,7 +348,7 @@ graphics_liblyxgraphics_a_SOURCES = \
EXTRA_DIST += mathed/InsetFormulaMacro.cpp
noinst_LIBRARIES += mathed/liblyxmathed.a
noinst_LIBRARIES += liblyxmathed.a
SOURCEFILESMATHED = \
mathed/InsetMathAMSArray.cpp \
@ -486,25 +486,25 @@ HEADERFILESMATHED = \
mathed/MathSupport.h \
mathed/TextPainter.h
mathed/lyxmathed.cpp:
lyxmathed.cpp:
@echo -e '$(SOURCEFILESMATHED:%=\n#include "%")\n' > $@
if MONOLITHIC_MATHED
BUILT_SOURCES += mathed/lyxmathed.cpp
CLEANFILES += mathed/lyxmathed.cpp
BUILT_SOURCES += lyxmathed.cpp
CLEANFILES += lyxmathed.cpp
mathed_liblyxmathed_a_SOURCES = mathed/lyxmathed.cpp $(HEADERFILESMATHED)
liblyxmathed_a_SOURCES = lyxmathed.cpp $(HEADERFILESMATHED)
else
mathed_liblyxmathed_a_SOURCES = $(SOURCEFILESMATHED) $(HEADERFILESMATHED)
liblyxmathed_a_SOURCES = $(SOURCEFILESMATHED) $(HEADERFILESMATHED)
endif
############################### Insets ##############################
noinst_LIBRARIES += insets/liblyxinsets.a
noinst_LIBRARIES += liblyxinsets.a
SOURCEFILESINSETS = \
insets/ExternalSupport.cpp \
@ -619,18 +619,18 @@ HEADERFILESINSETS = \
# insets/InsetSection.h \
# insets/InsetSection.cpp
insets/lyxinsets.cpp:
lyxinsets.cpp:
@echo -e '$(SOURCEFILESINSETS:%=\n#include "%")\n' > $@
if MONOLITHIC_INSETS
BUILT_SOURCES += insets/lyxinsets.cpp
CLEANFILES += insets/lyxinsets.cpp
BUILT_SOURCES += lyxinsets.cpp
CLEANFILES += lyxinsets.cpp
insets_liblyxinsets_a_SOURCES = insets/lyxinsets.cpp $(HEADERFILESINSETS)
liblyxinsets_a_SOURCES = lyxinsets.cpp $(HEADERFILESINSETS)
else
insets_liblyxinsets_a_SOURCES = $(SOURCEFILESINSETS) $(HEADERFILESINSETS)
liblyxinsets_a_SOURCES = $(SOURCEFILESINSETS) $(HEADERFILESINSETS)
endif