Fix bug #7657: Detect inkscape from the configure script

[lyx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index cf255568276173ce1ff39b1883258403312974c2..c10b8e51cb1c8007783c1f69cc23279c02724a5e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/config/common.am
 
 ############################### Core  ##############################
 
-AM_CPPFLAGS += $(PCH_FLAGS) -I$(top_srcdir)/src $(BOOST_INCLUDES) $(ENCHANT_CFLAGS) $(HUNSPELL_CFLAGS)
+AM_CPPFLAGS += -I$(top_srcdir)/src $(BOOST_INCLUDES) $(ENCHANT_CFLAGS) $(HUNSPELL_CFLAGS)
 AM_CPPFLAGS += $(QT_CPPFLAGS) $(QT_CORE_INCLUDES)
 
 if BUILD_CLIENT_SUBDIR
@@ -12,7 +12,6 @@ endif
 SUBDIRS = support frontends . $(CLIENT) tex2lyx
 
 EXTRA_DIST = lyx_commit_hash.h.in \
-       pch.h \
        CMakeLists.txt \
        graphics/CMakeLists.txt \
        insets/CMakeLists.txt \
@@ -51,8 +50,6 @@ endif
 
 #lyx_LDFLAGS=-Wl,-O1
 
-BUILT_SOURCES = $(PCH_FILE)
-
 if INSTALL_MACOSX
 APPLESPELL = AppleSpellChecker.cpp AppleSpellChecker.h
 endif
@@ -104,7 +101,6 @@ endif
 
 SOURCEFILESCORE = \
        Author.cpp \
-       Bidi.cpp \
        boost.cpp \
        BranchList.cpp \
        Buffer.cpp \
@@ -199,7 +195,6 @@ SOURCEFILESCORE = \
 
 HEADERFILESCORE = \
        Author.h \
-       Bidi.h \
        BranchList.h \
        buffer_funcs.h \
        Buffer.h \
@@ -324,8 +319,8 @@ update_commit_hash:
 
 lyx_commit_hash.h: update_commit_hash
 
-BUILT_SOURCES += lyx_commit_hash.h
-CLEANFILES += lyx_commit_hash.h
+BUILT_SOURCES = lyx_commit_hash.h
+CLEANFILES = lyx_commit_hash.h
 
 lyxcore.cpp:
        @echo -e '$(SOURCEFILESCORE:%=\n#include "%")\n' > $@
@@ -573,6 +568,7 @@ SOURCEFILESINSETS = \
        insets/InsetBox.cpp \
        insets/InsetBranch.cpp \
        insets/InsetCaption.cpp \
+       insets/InsetCaptionable.cpp \
        insets/InsetCitation.cpp \
        insets/InsetCollapsable.cpp \
        insets/InsetCommand.cpp \
@@ -631,6 +627,7 @@ HEADERFILESINSETS = \
        insets/InsetBox.h \
        insets/InsetBranch.h \
        insets/InsetCaption.h \
+       insets/InsetCaptionable.h \
        insets/InsetCitation.h \
        insets/InsetCode.h \
        insets/InsetCollapsable.h \