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

* Make the PCH stuff work properly when source directory

Browse Source 
and build directory differ.
* A couple of minor fixes to the Makefiles' DISTCLEAN targets.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9905 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2005-05-04 16:42:06 +00:00
parent 3cbfd8cc80
commit 817e3efdf3
6 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
config/ChangeLog
View File

@ -1,3 +1,12 @@
2005-05-04 Angus Leeming <leeming@lyx.org>
* common.am (*.o *.lo *.obj): make the TARGETS depend on $(PCH_FILE),
not the SOURCES.
(pch-file): name the generated .pch.h.gch file explicitly.
Enables the file to be output to the build directory if different
to the source directory.
(DISTCLEANFILES): add pch.h.gch.dep
2005-05-03 Angus Leeming <leeming@lyx.org>
* Makefile.am: remove [ap]spell.m4 and add spell.m4.

12
config/common.am
View File

@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = foreign
CLEANFILES = pch.h.gch
DISTCLEANFILES= *.orig *.rej *~ *.bak core
DISTCLEANFILES= pch.h.gch.dep *.orig *.rej *~ *.bak core
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
@ -16,16 +16,16 @@ PCH_FLAGS = -Winvalid-pch --include=$(PCH_SOURCE)
PCH_FILE = ./pch.h.gch
sinclude ./pch.h.gch.dep
*.C *.cpp: $(PCH_FILE)
*.o *.lo *.obj: $(PCH_FILE)
$(PCH_FILE): $(PCH_SOURCE)
$(MAKE) PCH_FLAGS= pch-file
pch-file:
$(CXXCOMPILE) -x c++-header $(PCH_SOURCE) -MT $(PCH_FILE) -MD -MP \
-MF "./$(PCH_FILE).Tdep" \
&& mv "./$(PCH_FILE).Tdep" "./$(PCH_FILE).dep" || rm "./$(PCH_FILE).Tdep"
$(CXXCOMPILE) -x c++-header $(PCH_SOURCE) -o $(PCH_FILE) \
-MT $(PCH_FILE) -MD -MP -MF "./$(PCH_FILE).Tdep" \
&& mv "./$(PCH_FILE).Tdep" "./$(PCH_FILE).dep" \
|| rm "./$(PCH_FILE).Tdep"
endif
SUFFIXES = .gch

4
lib/ChangeLog
View File

@ -1,3 +1,7 @@
2005-05-04 Angus Leeming <leeming@lyx.org>
* Makefile.am (DISTCLEANFILES): add texput.log.
2005-04-28 Michael Schmitt <michael.schmitt@teststep.org>
* layouts/*.layout:

2
lib/Makefile.am
View File

@ -1,6 +1,6 @@
include $(top_srcdir)/config/common.am
DISTCLEANFILES += textclass.lst packages.lst lyxrc.defaults
DISTCLEANFILES += texput.log textclass.lst packages.lst lyxrc.defaults
SUBDIRS = doc reLyX

4
src/frontends/qt2/ChangeLog
View File

@ -1,3 +1,7 @@
2005-05-04 Angus Leeming <leeming@lyx.org>
* ui/Makefile.am (CLEANFILES): add *Module.h and *Dialog.h.
2005-05-02 Jürgen Spitzmüller <j.spitzmueller@gmx.de>
* QTabularDialog.C: correcht handling of the LFUN_UNSET_*

2
src/frontends/qt2/ui/Makefile.am
View File

@ -1,7 +1,7 @@
include $(top_srcdir)/config/common.am
include $(srcdir)/../Makefile.dialogs
CLEANFILES += *.C *Base.h
CLEANFILES += *.C *Base.h *Module.h *Dialog.h
SUBDIRS = . moc