X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMakefile.am;h=15a3dfa49615c6a762bbd1967b99241c089940d1;hb=66c5d055e776e0cd08fb35c164b49d9ccc7812b7;hp=9bc6b197708506a46baf1b9ea0e6070bc020dd78;hpb=29378af4cdf9db7a7d6a72a9df34b8593f73f0e8;p=lyx.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 9bc6b19770..15a3dfa496 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,7 +11,7 @@ if BUILD_CLIENT_SUBDIR
 CLIENT = client
 endif
 
-SUBDIRS = support frontends . $(CLIENT) tex2lyx
+SUBDIRS = support frontends . $(CLIENT) tex2lyx convert
 
 EXTRA_DIST = lyx_commit_hash.h.in \
 	CMakeLists.txt \
@@ -27,16 +27,17 @@ OTHERLIBS = $(BOOST_LIBS) $(MYTHES_LIBS) $(ENCHANT_LIBS) $(HUNSPELL_LIBS) \
 noinst_LIBRARIES = liblyxcore.a
 bin_PROGRAMS = lyx
 
+lyx_LDFLAGS = $(AM_LDFLAGS) $(QT_LDFLAGS)
+
 lyx_LDADD = \
 	liblyxcore.a \
 	liblyxmathed.a \
 	liblyxinsets.a \
 	frontends/liblyxfrontends.a \
-	frontends/qt4/liblyxqt4.a \
+	frontends/qt/liblyxqt.a \
 	liblyxgraphics.a \
 	support/liblyxsupport.a \
 	$(OTHERLIBS) \
-	$(QT_LDFLAGS) \
 	$(QT_LIB)
 
 if LYX_WIN_RESOURCE
@@ -46,9 +47,10 @@ if LYX_WIN_RESOURCE
 endif
 
 if INSTALL_MACOSX
-lyx_LDFLAGS = -framework AppKit -framework ApplicationServices \
+lyx_LDFLAGS += -framework AppKit -framework ApplicationServices \
 	-Wl,-rpath,@loader_path/../Frameworks \
-	-Wl,-rpath,@executable_path/../Frameworks
+	-Wl,-rpath,@executable_path/../Frameworks \
+	-Wl,-headerpad_max_install_names
 endif
 
 if INSTALL_MACOSX
@@ -305,14 +307,14 @@ STANDALONEFILES = \
 
 .PHONY: update_commit_hash
 
-LCH_V_GEN = $(lch__v_GEN_@AM_V@)
-lch__v_GEN_ = $(lch__v_GEN_@AM_DEFAULT_V@)
-lch__v_GEN_0 = @echo "  GEN      lyx_commit_hash.h";
-lch__v_GEN_1 =
+LCH_V_CHK = $(lch__v_CHK_@AM_V@)
+lch__v_CHK_ = $(lch__v_CHK_@AM_DEFAULT_V@)
+lch__v_CHK_0 = @echo "  CHK      lyx_commit_hash.h";
+lch__v_CHK_1 =
 
 update_commit_hash:
-	rm -f hash-temp \
-	$(LCH_V_GEN)hash=`cd "$(top_srcdir)" && git log -1 --pretty=format:%H 2>/dev/null || echo none` ; \
+	$(LCH_V_CHK)rm -f hash-temp ; \
+	hash=`cd "$(top_srcdir)" && git log -1 --pretty=format:%H 2>/dev/null || echo none` ; \
 	sed s/@LYX_GIT_COMMIT_HASH@/$$hash/ "$(srcdir)"/lyx_commit_hash.h.in >hash-temp ; \
 	cmp -s lyx_commit_hash.h hash-temp || cp hash-temp lyx_commit_hash.h ; \
 	rm -f hash-temp
@@ -322,22 +324,8 @@ lyx_commit_hash.h: update_commit_hash
 BUILT_SOURCES = lyx_commit_hash.h
 CLEANFILES = lyx_commit_hash.h
 
-lyxcore.cpp:
-	$(AM_V_GEN)for file in $(SOURCEFILESCORE) ; do echo '#include "'$${file}'"' ; done >$@
-
-if MONOLITHIC_CORE
-
-BUILT_SOURCES += lyxcore.cpp $(STANDALONEFILES)
-CLEANFILES += lyxcore.cpp
-
-nodist_liblyxcore_a_SOURCES = lyxcore.cpp
-liblyxcore_a_SOURCES = $(STANDALONEFILES) $(HEADERFILESCORE)
-
-else
-
 liblyxcore_a_SOURCES = $(SOURCEFILESCORE) $(STANDALONEFILES) $(HEADERFILESCORE)
 
-endif
 
 #########################  Qt stuff  ##############################
 
@@ -411,6 +399,7 @@ SOURCEFILESMATHED = \
 	mathed/InsetMathDecoration.cpp \
 	mathed/InsetMathDecoration.h \
 	mathed/InsetMathDelim.cpp \
+	mathed/InsetMathDiagram.cpp \
 	mathed/InsetMathDiff.cpp \
 	mathed/InsetMathDots.cpp \
 	mathed/InsetMathEnsureMath.cpp \
@@ -452,7 +441,6 @@ SOURCEFILESMATHED = \
 	mathed/InsetMathUnknown.cpp \
 	mathed/InsetMathXArrow.cpp \
 	mathed/InsetMathXYMatrix.cpp \
-	mathed/InsetMathDiagram.cpp \
 	mathed/MacroTable.cpp \
 	mathed/MathAtom.cpp \
 	mathed/MathAutoCorrect.cpp \
@@ -541,22 +529,8 @@ HEADERFILESMATHED = \
 	mathed/MathSupport.h \
 	mathed/TextPainter.h
 
-lyxmathed.cpp:
-	$(AM_V_GEN)for file in $(SOURCEFILESMATHED) ; do echo '#include "'$${file}'"' ; done >$@
-
-if MONOLITHIC_MATHED
-
-BUILT_SOURCES += lyxmathed.cpp
-CLEANFILES += lyxmathed.cpp
-
-nodist_liblyxmathed_a_SOURCES = lyxmathed.cpp
-liblyxmathed_a_SOURCES = $(HEADERFILESMATHED)
-
-else
-
 liblyxmathed_a_SOURCES = $(SOURCEFILESMATHED) $(HEADERFILESMATHED)
 
-endif
 
 ############################### Insets  ##############################
 
@@ -578,7 +552,7 @@ SOURCEFILESINSETS = \
 	insets/InsetCaption.cpp \
 	insets/InsetCaptionable.cpp \
 	insets/InsetCitation.cpp \
-	insets/InsetCollapsable.cpp \
+	insets/InsetCollapsible.cpp \
 	insets/InsetCommand.cpp \
 	insets/InsetCommandParams.cpp \
 	insets/InsetERT.cpp \
@@ -638,7 +612,7 @@ HEADERFILESINSETS = \
 	insets/InsetCaptionable.h \
 	insets/InsetCitation.h \
 	insets/InsetCode.h \
-	insets/InsetCollapsable.h \
+	insets/InsetCollapsible.h \
 	insets/InsetCommand.h \
 	insets/InsetCommandParams.h \
 	insets/InsetERT.h \
@@ -680,23 +654,8 @@ HEADERFILESINSETS = \
 	insets/InsetVSpace.h \
 	insets/InsetWrap.h
 
-lyxinsets.cpp:
-	$(AM_V_GEN)for file in $(SOURCEFILESINSETS) ; do echo '#include "'$${file}'"' ; done >$@
-
-if MONOLITHIC_INSETS
-
-BUILT_SOURCES += lyxinsets.cpp
-CLEANFILES += lyxinsets.cpp
-
-nodist_liblyxinsets_a_SOURCES = lyxinsets.cpp
-liblyxinsets_a_SOURCES = $(HEADERFILESINSETS)
-
-else
-
 liblyxinsets_a_SOURCES = $(SOURCEFILESINSETS) $(HEADERFILESINSETS)
 
-endif
-
 
 ############################## Tests ##################################