From a78c91bdbb9d9ad70e97cb21211d62b74d44ae44 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Tue, 12 Jul 2005 23:42:23 +0000 Subject: [PATCH] make sure to dist pch.h and mark PCH_FILE as a built file git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10173 a592a061-630c-0410-9148-cb99ea01b6c8 --- ChangeLog | 5 +++++ boost/libs/filesystem/src/Makefile.am | 4 ++++ boost/libs/regex/src/Makefile.am | 4 ++++ boost/libs/signals/src/Makefile.am | 4 ++++ src/Makefile.am | 5 +++-- src/client/Makefile.am | 4 +++- src/frontends/Makefile.am | 4 ++++ src/frontends/controllers/Makefile.am | 4 +++- src/frontends/gtk/Makefile.am | 4 ++++ src/frontends/qt2/Makefile.am | 4 +++- src/frontends/qt2/ui/Makefile.am | 4 +++- src/frontends/xforms/Makefile.am | 5 +++-- src/frontends/xforms/forms/Makefile.am | 4 +++- src/graphics/Makefile.am | 4 ++++ src/insets/Makefile.am | 3 +++ src/mathed/Makefile.am | 4 +++- src/support/Makefile.am | 4 ++-- src/support/tests/Makefile.am | 4 +++- src/tex2lyx/Makefile.am | 15 +++++++++------ 19 files changed, 70 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index 003920d45a..ceacbf70a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-07-13 Lars Gullik Bjonnes + + * Makefiles: make sure to dist pch.h and mark PCH_FILE as a build + file. + 2005-07-12 Jean-Marc Lasgouttes * INSTALL: small tweak. diff --git a/boost/libs/filesystem/src/Makefile.am b/boost/libs/filesystem/src/Makefile.am index 6765ad56d5..a6264adf0f 100644 --- a/boost/libs/filesystem/src/Makefile.am +++ b/boost/libs/filesystem/src/Makefile.am @@ -1,5 +1,9 @@ include $(top_srcdir)/config/common.am +EXTRA_DIST = pch.h + +BUILT_SOURCES = $(PCH_FILE) + noinst_LTLIBRARIES = libboost_filesystem.la AM_CPPFLAGS += \ diff --git a/boost/libs/regex/src/Makefile.am b/boost/libs/regex/src/Makefile.am index 21241e9e73..8a621f795b 100644 --- a/boost/libs/regex/src/Makefile.am +++ b/boost/libs/regex/src/Makefile.am @@ -1,5 +1,9 @@ include $(top_srcdir)/config/common.am +EXTRA_DIST = pch.h + +BUILT_SOURCES = $(PCH_FILE) + noinst_LTLIBRARIES = libboost_regex.la AM_CPPFLAGS += \ diff --git a/boost/libs/signals/src/Makefile.am b/boost/libs/signals/src/Makefile.am index 99cee23980..636736278d 100644 --- a/boost/libs/signals/src/Makefile.am +++ b/boost/libs/signals/src/Makefile.am @@ -1,5 +1,9 @@ include $(top_srcdir)/config/common.am +EXTRA_DIST = pch.h + +BUILT_SOURCES = $(PCH_FILE) + noinst_LTLIBRARIES = libboost_signals.la AM_CPPFLAGS += \ diff --git a/src/Makefile.am b/src/Makefile.am index ef9f546742..509cd7f63b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -15,7 +15,8 @@ EXTRA_DIST = config.h.in stamp-h.in version.C.in \ Sectioning.C \ Variables.C \ Variables.h \ - paper.h + paper.h \ + pch.h LYX_PRE_LIBS = mathed/libmathed.la insets/libinsets.la \ frontends/libfrontends.la @@ -51,7 +52,7 @@ lyx$(EXEEXT): $(FRONTENDS_PROGS) #lyx_LDFLAGS=-Wl,-O1 -BUILT_SOURCES = version.C +BUILT_SOURCES = $(PCH_FILE) version.C AM_CPPFLAGS += $(PCH_FLAGS) $(BOOST_INCLUDES) diff --git a/src/client/Makefile.am b/src/client/Makefile.am index feb68401fb..4929396271 100644 --- a/src/client/Makefile.am +++ b/src/client/Makefile.am @@ -2,7 +2,9 @@ include $(top_srcdir)/config/common.am CLEANFILES += $(man_MANS) -EXTRA_DIST = lyxclient.man +EXTRA_DIST = pch.h lyxclient.man + +BUILT_SOURCES = $(PCH_FILE) man_MANS = lyxclient.1 diff --git a/src/frontends/Makefile.am b/src/frontends/Makefile.am index a310e8cc8c..88a42a3427 100644 --- a/src/frontends/Makefile.am +++ b/src/frontends/Makefile.am @@ -4,6 +4,10 @@ SUBDIRS = controllers $(FRONTENDS_SUBDIRS) DIST_SUBDIRS = controllers xforms qt2 gtk +EXTRA_DIST = pch.h + +BUILT_SOURCES = $(PCH_FILE) + noinst_LTLIBRARIES = libfrontends.la AM_CPPFLAGS += $(PCH_FLAGS) -I$(srcdir)/.. $(BOOST_INCLUDES) diff --git a/src/frontends/controllers/Makefile.am b/src/frontends/controllers/Makefile.am index 618777ac1b..b1c322782d 100644 --- a/src/frontends/controllers/Makefile.am +++ b/src/frontends/controllers/Makefile.am @@ -1,6 +1,8 @@ include $(top_srcdir)/config/common.am -EXTRA_DIST = BCView.tmpl +EXTRA_DIST = pch.h BCView.tmpl + +BUILT_SOURCES = $(PCH_FILE) noinst_LTLIBRARIES = libcontrollers.la diff --git a/src/frontends/gtk/Makefile.am b/src/frontends/gtk/Makefile.am index e8235cb84e..36a4c4f87c 100644 --- a/src/frontends/gtk/Makefile.am +++ b/src/frontends/gtk/Makefile.am @@ -2,6 +2,10 @@ include $(top_srcdir)/config/common.am SUBDIRS = gimages glade +EXTRA_DIST = pch.h + +BUILT_SOURCES = $(PCH_FILE) + noinst_LTLIBRARIES = libgtk.la AM_CPPFLAGS += \ diff --git a/src/frontends/qt2/Makefile.am b/src/frontends/qt2/Makefile.am index afaf382cef..1ca211f3a1 100644 --- a/src/frontends/qt2/Makefile.am +++ b/src/frontends/qt2/Makefile.am @@ -3,7 +3,9 @@ include $(srcdir)/Makefile.dialogs SUBDIRS = ui moc -EXTRA_DIST = Makefile.dialogs +EXTRA_DIST = pch.h Makefile.dialogs + +BUILT_SOURCES = $(PCH_FILE) noinst_LTLIBRARIES = libqt2.la diff --git a/src/frontends/qt2/ui/Makefile.am b/src/frontends/qt2/ui/Makefile.am index de7f55e6c8..5008d27cf7 100644 --- a/src/frontends/qt2/ui/Makefile.am +++ b/src/frontends/qt2/ui/Makefile.am @@ -5,7 +5,9 @@ CLEANFILES += *.C *Base.h *Module.h *Dialog.h SUBDIRS = . moc -EXTRA_DIST = QPreambleDialogBase.ui $(UIFILES) +EXTRA_DIST = pch.h QPreambleDialogBase.ui $(UIFILES) + +BUILT_SOURCES = $(PCH_FILE) AM_CPPFLAGS += \ $(QT_CPPFLAGS) -DQT_NO_TRANSLATION \ diff --git a/src/frontends/xforms/Makefile.am b/src/frontends/xforms/Makefile.am index e8155c8fa1..4a04a4e6f5 100644 --- a/src/frontends/xforms/Makefile.am +++ b/src/frontends/xforms/Makefile.am @@ -3,9 +3,10 @@ include $(top_srcdir)/config/common.am SUBDIRS = forms CLEANFILES += stamp-xpm stamp-forms DISTCLEANFILES += lyx_forms.h lyx_forms.h-tmp lyx_xpm.h lyx_xpm.h-tmp -BUILT_SOURCES = lyx_forms.h lyx_xpm.h -EXTRA_DIST = lyx_forms.h.in lyx_xpm.h.in +BUILT_SOURCES = $(PCH_FILE) lyx_forms.h lyx_xpm.h + +EXTRA_DIST = pch.h lyx_forms.h.in lyx_xpm.h.in AM_CPPFLAGS += \ -I$(top_srcdir)/images \ diff --git a/src/frontends/xforms/forms/Makefile.am b/src/frontends/xforms/forms/Makefile.am index 66d42463f2..13e791858d 100644 --- a/src/frontends/xforms/forms/Makefile.am +++ b/src/frontends/xforms/forms/Makefile.am @@ -2,7 +2,9 @@ include $(top_srcdir)/config/common.am DISTCLEANFILES += $(SRCS:.fd=.C) $(SRCS:.fd=.h) $(SRCS:.fd=.c) -EXTRA_DIST = fdfixc.sed fdfixh.sed fdfix.sh tmp_str.sed README $(SRCS) +EXTRA_DIST = pch.h fdfixc.sed fdfixh.sed fdfix.sh tmp_str.sed README $(SRCS) + +BUILT_SOURCES = $(PCH_FILE) # For (forms_fwd.h, forms_gettext.h) and support/std_string.h, respectively. AM_CPPFLAGS += $(PCH_FLAGS) -I$(srcdir)/.. -I$(top_srcdir)/src -I.. diff --git a/src/graphics/Makefile.am b/src/graphics/Makefile.am index 923fd53eb3..1c92b93c1b 100644 --- a/src/graphics/Makefile.am +++ b/src/graphics/Makefile.am @@ -1,5 +1,9 @@ include $(top_srcdir)/config/common.am +EXTRA_DIST = pch.h + +BUILT_SOURCES = $(PCH_FILE) + noinst_LTLIBRARIES = libgraphics.la AM_CPPFLAGS += $(PCH_FLAGS) -I$(srcdir)/.. $(BOOST_INCLUDES) diff --git a/src/insets/Makefile.am b/src/insets/Makefile.am index da08b05051..5685c9ee60 100644 --- a/src/insets/Makefile.am +++ b/src/insets/Makefile.am @@ -3,9 +3,12 @@ include $(top_srcdir)/config/common.am noinst_LTLIBRARIES = libinsets.la EXTRA_DIST = \ + pch.h \ insettheorem.C \ insettheorem.h +BUILT_SOURCES = $(PCH_FILE) + AM_CPPFLAGS += $(PCH_FLAGS) -I$(srcdir)/.. $(BOOST_INCLUDES) libinsets_la_SOURCES = \ diff --git a/src/mathed/Makefile.am b/src/mathed/Makefile.am index ae7aef24f5..62cca54f10 100644 --- a/src/mathed/Makefile.am +++ b/src/mathed/Makefile.am @@ -1,6 +1,8 @@ include $(top_srcdir)/config/common.am -EXTRA_DIST = formulamacro.C +EXTRA_DIST = pch.h formulamacro.C + +BUILT_SOURCES = $(PCH_FILE) noinst_LTLIBRARIES = libmathed.la diff --git a/src/support/Makefile.am b/src/support/Makefile.am index da402acf27..61453fb6ee 100644 --- a/src/support/Makefile.am +++ b/src/support/Makefile.am @@ -4,7 +4,7 @@ SUBDIRS = . tests CLEANFILES += $(BUILT_SOURCES) -EXTRA_DIST = package.C.in os_unix.C os_win32.C os_os2.C +EXTRA_DIST = package.C.in pch.h os_unix.C os_win32.C os_os2.C noinst_LTLIBRARIES = libsupport.la @@ -12,7 +12,7 @@ if USE_COMPRESSION COMPRESSION = gzstream.C gzstream.h endif -BUILT_SOURCES = package.C +BUILT_SOURCES = $(PCH_FILE) package.C AM_CPPFLAGS += $(PCH_FLAGS) -I$(srcdir)/.. $(BOOST_INCLUDES) diff --git a/src/support/tests/Makefile.am b/src/support/tests/Makefile.am index 42700c411f..30ca937991 100644 --- a/src/support/tests/Makefile.am +++ b/src/support/tests/Makefile.am @@ -1,6 +1,8 @@ include $(top_srcdir)/config/common.am -EXTRA_DIST = test_convert test_lstrings regfiles +EXTRA_DIST = pch.h test_convert test_lstrings regfiles + +BUILT_SOURCES = $(PCH_FILE) TESTS = \ test_convert \ diff --git a/src/tex2lyx/Makefile.am b/src/tex2lyx/Makefile.am index ce7c147619..2fb64523d7 100644 --- a/src/tex2lyx/Makefile.am +++ b/src/tex2lyx/Makefile.am @@ -1,7 +1,8 @@ include $(top_srcdir)/config/common.am -EXTRA_DIST = test-structure.tex test-insets.tex -DISTCLEANFILES += $(BUILT_SOURCES) +EXTRA_DIST = pch.h test-structure.tex test-insets.tex + +DISTCLEANFILES += $(LINKED_SOURCES) #noinst_LTLIBRARIES = libtexparser.la # @@ -21,7 +22,7 @@ if USE_COMPRESSION COMPRESSIONLIB = -lz endif -BUILT_SOURCES = \ +LINKED_SOURCES = \ FloatList.C \ Floating.C \ counters.C \ @@ -32,8 +33,10 @@ BUILT_SOURCES = \ lyxlex.C \ lyxlex_pimpl.C +BUILT_SOURCES = $(PCH_FILE) $(LINKED_SOURCES) + tex2lyx_SOURCES = \ - $(BUILT_SOURCES) \ + $(LINKED_SOURCES) \ Spacing.h \ boost.C \ context.C \ @@ -56,9 +59,9 @@ tex2lyx_LDADD = \ $(top_builddir)/src/support/libsupport.la \ $(BOOST_LIBS) $(COMPRESSIONLIB) -$(BUILT_SOURCES) : +$(LINKED_SOURCES) : @rm -f $@ ; \ $(LN_S) $(top_srcdir)/src/$@ . rm_link_files: - rm -f $(BUILT_SOURCES) + rm -f $(LINKED_SOURCES) -- 2.39.2