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

remove libtool

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27468 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2008-11-15 17:45:55 +00:00
parent 937de4d880
commit bb12808b20
12 changed files with 51 additions and 13644 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
boost/Makefile.am
View File

@ -1,6 +1,6 @@
include $(top_srcdir)/config/common.am
noinst_LTLIBRARIES = liblyxboost.la
noinst_LIBRARIES = liblyxboost.a
# Using precompiled headers makes compilation >10% slower
#EXTRA_DIST = pch.h
@ -16,7 +16,7 @@ AM_CPPFLAGS += $(BOOST_INCLUDES)
if MONOLITHIC_BOOST
liblyxboost_la_SOURCES = \
liblyxboost_a_SOURCES = \
lyxboost.cpp \
libs/regex/src/instances.cpp \
libs/regex/src/cpp_regex_traits.cpp \
@ -24,7 +24,7 @@ liblyxboost_la_SOURCES = \
else
liblyxboost_la_SOURCES = \
liblyxboost_a_SOURCES = \
\
libs/regex/src/c_regex_traits.cpp \
libs/regex/src/cpp_regex_traits.cpp \

1
config/Makefile.am
View File

@ -2,7 +2,6 @@ include $(top_srcdir)/config/common.am
EXTRA_DIST = \
common.am \
libtool.m4 \
lyxinclude.m4 \
pkg.m4 \
qt4.m4 \

2
config/common.am
View File

@ -30,7 +30,7 @@ SUFFIXES = .gch
if USE_INCLUDED_BOOST
BOOST_INCLUDES = -I$(top_srcdir)/boost
BOOST_LIBS = $(top_builddir)/boost/liblyxboost.la
BOOST_LIBS = $(top_builddir)/boost/liblyxboost.a
else
BOOST_INCLUDES =
BOOST_FILESYSTEM = -lboost_filesystem

6638
config/libtool.m4 vendored
View File

File diff suppressed because it is too large Load Diff

6956
config/ltmain.sh
View File

File diff suppressed because it is too large Load Diff

3
configure.ac
View File

@ -146,9 +146,6 @@ m4_defun([AC_PROG_F77],[])
AC_DISABLE_SHARED
#AC_DISABLE_STATIC
AC_LIBTOOL_WIN32_DLL
#AM_PROG_LIBTOOL
LYX_PROG_LIBTOOL
### We need iconv for unicode support (Qt4 frontend requires it too)
AM_ICONV

37
src/Makefile.am
View File

@ -21,18 +21,19 @@ EXTRA_DIST = Section.h \
OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(MYTHES_LIBS) $(AIKSAURUS_LIBS) @LIBS@ $(SOCKET_LIBS)
noinst_LTLIBRARIES = liblyxcore.la
noinst_LIBRARIES = liblyxcore.a
bin_PROGRAMS = lyx
lyx_LDADD = \
liblyxcore.la \
liblyxmathed.la \
liblyxinsets.la \
frontends/liblyxfrontends.la \
frontends/qt4/liblyxqt4.la \
liblyxgraphics.la \
support/liblyxsupport.la \
liblyxcore.a \
liblyxmathed.a \
liblyxinsets.a \
frontends/liblyxfrontends.a \
frontends/qt4/liblyxqt4.a \
liblyxgraphics.a \
support/liblyxsupport.a \
$(OTHERLIBS) \
$(QT4_LDFLAGS) \
$(QT4_LIB)
if LYX_WIN_RESOURCE
@ -280,19 +281,19 @@ if MONOLITHIC_CORE
BUILT_SOURCES += lyxcore.cpp $(STANDALONEFILES)
CLEANFILES += lyxcore.cpp
liblyxcore_la_SOURCES = lyxcore.cpp $(STANDALONEFILES) $(HEADERFILESCORE)
liblyxcore_a_SOURCES = lyxcore.cpp $(STANDALONEFILES) $(HEADERFILESCORE)
else
liblyxcore_la_SOURCES = $(SOURCEFILESCORE) $(STANDALONEFILES) $(HEADERFILESCORE)
liblyxcore_a_SOURCES = $(SOURCEFILESCORE) $(STANDALONEFILES) $(HEADERFILESCORE)
endif
############################### Graphics ##############################
noinst_LTLIBRARIES += liblyxgraphics.la
noinst_LIBRARIES += liblyxgraphics.a
liblyxgraphics_la_SOURCES = \
liblyxgraphics_a_SOURCES = \
graphics/GraphicsCache.h \
graphics/GraphicsCache.cpp \
graphics/GraphicsCacheItem.h \
@ -317,7 +318,7 @@ liblyxgraphics_la_SOURCES = \
EXTRA_DIST += mathed/InsetFormulaMacro.cpp
noinst_LTLIBRARIES += liblyxmathed.la
noinst_LIBRARIES += liblyxmathed.a
SOURCEFILESMATHED = \
mathed/InsetMathAMSArray.cpp \
@ -463,17 +464,17 @@ if MONOLITHIC_MATHED
BUILT_SOURCES += lyxmathed.cpp
CLEANFILES += lyxmathed.cpp
liblyxmathed_la_SOURCES = lyxmathed.cpp $(HEADERFILESMATHED)
liblyxmathed_a_SOURCES = lyxmathed.cpp $(HEADERFILESMATHED)
else
liblyxmathed_la_SOURCES = $(SOURCEFILESMATHED) $(HEADERFILESMATHED)
liblyxmathed_a_SOURCES = $(SOURCEFILESMATHED) $(HEADERFILESMATHED)
endif
############################### Insets ##############################
noinst_LTLIBRARIES += liblyxinsets.la
noinst_LIBRARIES += liblyxinsets.a
SOURCEFILESINSETS = \
insets/ExternalSupport.cpp \
@ -592,10 +593,10 @@ if MONOLITHIC_INSETS
BUILT_SOURCES += lyxinsets.cpp
CLEANFILES += lyxinsets.cpp
liblyxinsets_la_SOURCES = lyxinsets.cpp $(HEADERFILESINSETS)
liblyxinsets_a_SOURCES = lyxinsets.cpp $(HEADERFILESINSETS)
else
liblyxinsets_la_SOURCES = $(SOURCEFILESINSETS) $(HEADERFILESINSETS)
liblyxinsets_a_SOURCES = $(SOURCEFILESINSETS) $(HEADERFILESINSETS)
endif

5
src/client/Makefile.am
View File

@ -14,8 +14,9 @@ lyxclient.1:
cp -p $(srcdir)/lyxclient.man lyxclient.1
lyxclient_LDADD = \
$(top_builddir)/src/support/liblyxsupport.la \
$(BOOST_LIBS) $(INTLLIBS) @LIBS@ $(SOCKET_LIBS)
$(top_builddir)/src/support/liblyxsupport.a \
$(BOOST_LIBS) $(INTLLIBS) @LIBS@ $(SOCKET_LIBS) \
$(QT4_LIB) $(QT4_LDFLAGS)
# everything below the line containing the single backslashs
# an ugly hack and needed because of the

4
src/frontends/Makefile.am
View File

@ -4,11 +4,11 @@ SUBDIRS = $(FRONTENDS_SUBDIRS) .
DIST_SUBDIRS = qt4 .
noinst_LTLIBRARIES = liblyxfrontends.la
noinst_LIBRARIES = liblyxfrontends.a
AM_CPPFLAGS += -I$(srcdir)/.. $(BOOST_INCLUDES)
liblyxfrontends_la_SOURCES = \
liblyxfrontends_a_SOURCES = \
alert.h \
Application.h \
FontLoader.h \

11
src/frontends/qt4/Makefile.am
View File

@ -31,11 +31,10 @@ Resources.cpp: Resources.qrc
######################### LIBRARIES #############################
noinst_LTLIBRARIES = liblyxqt4.la
noinst_LIBRARIES = liblyxqt4.a
liblyxqt4_la_DEPENDENCIES = $(MOCEDFILES)
liblyxqt4_la_LDFLAGS = $(QT4_LDFLAGS)
liblyxqt4_la_LIBADD = $(QT4_LIB)
liblyxqt4_a_DEPENDENCIES = $(MOCEDFILES)
#liblyxqt4_a_LIBADD = $(QT4_LIB) $(QT4_LDFLAGS)
AM_CPPFLAGS += \
$(QT4_CPPFLAGS) \
@ -311,7 +310,7 @@ liblyxqt4.cpp:
if MONOLITHIC_FRONTEND_QT4
liblyxqt4_la_SOURCES = \
liblyxqt4_a_SOURCES = \
liblyxqt4.cpp \
$(MOCHEADER) \
$(NOMOCHEADER)
@ -321,7 +320,7 @@ CLEANFILES += liblyxqt4.cpp
else
liblyxqt4_la_SOURCES = \
liblyxqt4_a_SOURCES = \
$(SOURCEFILES) \
$(MOCHEADER) \
$(NOMOCHEADER)

20
src/support/Makefile.am
View File

@ -5,10 +5,12 @@ CLEANFILES += $(BUILT_SOURCES)
EXTRA_DIST = pch.h \
os_cygwin.cpp os_unix.cpp os_win32.cpp os_win32.h
noinst_LTLIBRARIES = liblyxsupport.la
noinst_LIBRARIES = liblyxsupport.a
liblyxsupport_la_LIBADD = $(LIBSHLWAPI) $(QT4_CORE_LIB) $(BOOST_SIGNALS)
liblyxsupport_la_LDFLAGS = $(QT4_CORE_LDFLAGS)
liblyxsupport_a_LIBADD = $(LIBSHLWAPI) $(BOOST_SIGNALS)
# $(QT4_CORE_LIB)
# $(QT4_CORE_LDFLAGS)
BUILT_SOURCES = $(PCH_FILE)
@ -25,7 +27,7 @@ BUILT_SOURCES += $(MOCEDFILES)
moc_%.cpp: %.h
$(MOC4) -o $@ $<
liblyxsupport_la_DEPENDENCIES = $(MOCEDFILES)
liblyxsupport_a_DEPENDENCIES = $(MOCEDFILES)
#
##################################################################
@ -33,7 +35,7 @@ liblyxsupport_la_DEPENDENCIES = $(MOCEDFILES)
AM_CPPFLAGS += $(PCH_FLAGS) -I$(srcdir)/.. $(BOOST_INCLUDES)
AM_CPPFLAGS += $(QT4_CPPFLAGS) $(QT4_CORE_INCLUDES)
liblyxsupport_la_SOURCES = \
liblyxsupport_a_SOURCES = \
FileMonitor.h \
FileMonitor.cpp \
RandomAccessList.h \
@ -103,7 +105,7 @@ liblyxsupport_la_SOURCES = \
weighted_btree.h
if INSTALL_MACOSX
liblyxsupport_la_SOURCES += \
liblyxsupport_a_SOURCES += \
linkback/LinkBack.h \
linkback/LinkBack.m \
linkback/LinkBackProxy.h \
@ -133,19 +135,19 @@ check_PROGRAMS = \
check_filetools \
check_lstrings
check_convert_LDADD = liblyxsupport.la \
check_convert_LDADD = liblyxsupport.a \
$(BOOST_LIBS) $(QT4_CORE_LIB)
check_convert_LDFLAGS = $(QT4_CORE_LDFLAGS)
check_convert_SOURCES = \
tests/check_convert.cpp \
tests/boost.cpp
check_filetools_LDADD = liblyxsupport.la $(BOOST_LIBS)
check_filetools_LDADD = liblyxsupport.a $(BOOST_LIBS)
check_filetools_SOURCES = \
tests/check_filetools.cpp \
tests/boost.cpp
check_lstrings_LDADD = liblyxsupport.la $(BOOST_LIBS) $(QT4_CORE_LIB)
check_lstrings_LDADD = liblyxsupport.a $(BOOST_LIBS) $(QT4_CORE_LIB)
check_lstrings_LDFLAGS = $(QT4_CORE_LDFLAGS)
check_lstrings_SOURCES = \
tests/check_lstrings.cpp \

12
src/tex2lyx/Makefile.am
View File

@ -2,13 +2,13 @@ include $(top_srcdir)/config/common.am
EXTRA_DIST = $(TEST_FILES) pch.h
#noinst_LTLIBRARIES = libtexparser.la
#noinst_LIBRARIES = libtexparser.a
#
#libtexparser_la_SOURCES = \
#libtexparser_a_SOURCES = \
# Parser.cpp \
# Parser.h
#
#tex2lyx_LDADD = libtexparser.la
#tex2lyx_LDADD = libtexparser.a
man_MANS = tex2lyx.1
@ -63,5 +63,7 @@ tex2lyx_SOURCES = \
text.cpp
tex2lyx_LDADD = \
$(top_builddir)/src/support/liblyxsupport.la \
$(LIBICONV) $(BOOST_LIBS) @LIBS@
$(top_builddir)/src/support/liblyxsupport.a \
$(LIBICONV) $(BOOST_LIBS) \
$(QT4_LIB) $(QT4_LDFLAGS) \
@LIBS@