projects
/
modest
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes NB#114384, close modal dialogs when an external application opens an editor
[modest]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index
fc98820
..
e2de617
100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-24,10
+24,13
@@
# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.b
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-SUBDIRS= src man
-#po
+SUBDIRS= src man po
+
+if MODEST_HAVE_DBUS_API
+SUBDIRS += libmodest-dbus-client
+endif
if BUILD_TESTS
SUBDIRS += tests
if BUILD_TESTS
SUBDIRS += tests
@@
-37,21
+40,28
@@
if BUILD_DOCS
SUBDIRS += docs
endif
SUBDIRS += docs
endif
-
-
EXTRA_DIST= \
mkinstalldirs \
autogen.sh \
EXTRA_DIST= \
mkinstalldirs \
autogen.sh \
+ NEWS \
+ ChangeLog \
COPYING \
COPYING \
+ HACKING \
intltool-extract.in \
intltool-merge.in \
intltool-update.in \
debian/changelog \
debian/copyright \
intltool-extract.in \
intltool-merge.in \
intltool-update.in \
debian/changelog \
debian/copyright \
- debian/rules \
- debian/modest.links
+ debian/rules
DISTCLEANFILES = \
intltool-extract.in \
intltool-merge.in \
intltool-update.in
DISTCLEANFILES = \
intltool-extract.in \
intltool-merge.in \
intltool-update.in
+
+# we install the NEWS file, so we can give
+# a nice release note dialog when updating
+# (using the postinst thingie in debian/
+NEWS_FILE=NEWS
+newsdir=$(datadir)/modest/data
+news_DATA = $(NEWS_FILE)