From 57cb454fbebf173c73c40179dcdd7755ce06de9d Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Fri, 15 Apr 2016 16:16:07 +0200 Subject: [PATCH] Resources.cpp is a built source, it should not be in SOURCEFILES We want to avoid that Resources.cpp be distributed in the tar file. (cherry picked from commit ff17b366a05ff2c9e96b332917e4400de3481e7e) --- src/frontends/qt4/Makefile.am | 2 +- status.21x | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/frontends/qt4/Makefile.am b/src/frontends/qt4/Makefile.am index fc42e9b9d6..d01f384bac 100644 --- a/src/frontends/qt4/Makefile.am +++ b/src/frontends/qt4/Makefile.am @@ -54,7 +54,6 @@ SOURCEFILES = \ ButtonPolicy.h \ Dialog.cpp \ Dialog.h \ - Resources.cpp \ Action.cpp \ BulletsModule.cpp \ ButtonController.cpp \ @@ -357,6 +356,7 @@ UIFILES = \ VSpaceUi.ui \ WrapUi.ui +nodist_liblyxqt4_a_SOURCES = Resources.cpp liblyxqt4.cpp: @echo -e '$(SOURCEFILES:%=\n#include "%")\n' > $@ diff --git a/status.21x b/status.21x index 0338da9d47..cb4d43f8eb 100644 --- a/status.21x +++ b/status.21x @@ -211,4 +211,6 @@ What's new - Give a warning when system boost and stdlib-debug are used together (bug 9736). -- Correct Mac OS X package build script (10.11 SDK for Xcode 7 + El Capitan) +- Correct Mac OS X package build script (10.11 SDK for Xcode 7 + El Capitan). + +- Remove build file Resources.cpp from distribution (3.9M unpacked).