anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-12 16:50:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

- When compiling using automake >= 1.11, use the nicer `silent rules' output

Browse Source 
format.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34632 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2010-06-09 10:10:52 +00:00
parent db2d837603
commit b6aaf88297
3 changed files with 7 additions and 4 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 save_PACKAGE=$PACKAGE
AM_INIT_AUTOMAKE([foreign dist-bzip2 no-define 1.8]) AM_INIT_AUTOMAKE([foreign dist-bzip2 no-define 1.8])
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
PACKAGE=$save_PACKAGE PACKAGE=$save_PACKAGE
### Set the execute permissions of the various scripts correctly ### Set the execute permissions of the various scripts correctly

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

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

2
status.16x
View File

@ -142,4 +142,6 @@ What's new
- CMake: Installs all but the binaries into the 'Resource' folder - CMake: Installs all but the binaries into the 'Resource' folder
- When compiling using automake >= 1.11, use the nicer `silent rules' output
format.