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

Enable "silent rules" with automake 1.11. This leads to much nicer compilation

Browse Source 
output. The build should still work with older automake versions.

The po/ directory does not have the nice rules, because I do not want to 
modify Makefile.in.in therein.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32241 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2009-11-30 14:18:25 +00:00
parent ee85aa5db6
commit e4a483da32
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -27,6 +27,7 @@ AM_MAINTAINER_MODE
save_PACKAGE=$PACKAGE
AM_INIT_AUTOMAKE([foreign dist-bzip2 no-define 1.8])
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
PACKAGE=$save_PACKAGE
# Allow to build some parts of the code as one big chunk

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

@ -11,22 +11,22 @@ CLEANFILES += $(BUILT_SOURCES)
UIC4FLAGS=-tr lyx::qt_
ui_%.h: ui/%.ui
$(UIC4) $(UIC4FLAGS) $< -o $@
$(AM_V_GEN)$(UIC4) $(UIC4FLAGS) $< -o $@
MOCEDFILES = $(MOCHEADER:%.h=moc_%.cpp)
moc_%.cpp: %.h
$(MOC4) -o $@ $<
$(AM_V_GEN)$(MOC4) -o $@ $<
Resources.qrc: Makefile
echo "<!DOCTYPE RCC><RCC version='1.0'><qresource>" > $@
$(AM_V_GEN)echo "<!DOCTYPE RCC><RCC version='1.0'><qresource>" > $@ ; \
find $(top_srcdir)/lib/images -name '*.png' \
| sed -e 's:$(top_srcdir)/lib/\(.*\):<file alias="\1">&</file>:' \
>> $@
>> $@ ;\
echo "</qresource></RCC>" >> $@
Resources.cpp: Resources.qrc
$(RCC4) $< -name Resources -o $@
$(AM_V_GEN)$(RCC4) $< -name Resources -o $@
######################### LIBRARIES #############################