diff options
author | Tanu Kaskinen <tanuk@iki.fi> | 2009-10-02 17:24:44 +0300 |
---|---|---|
committer | Tanu Kaskinen <tanuk@iki.fi> | 2009-10-02 17:24:44 +0300 |
commit | 019331d25b6af107fb8cacc3ada552e7567a64bf (patch) | |
tree | d5545e795e164fb6cd8edae1a45e7b8bb966ee12 /Makefile.am | |
parent | 587131917f9129c8347c789febb7e755dfb091de (diff) | |
parent | afd1b6d355ef1a41cb3592485855e273a5de69c1 (diff) |
Merge branch 'master' into dbus-work
Conflicts:
src/daemon/daemon-conf.c
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 5967f2ce..2713c0a2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,12 +17,27 @@ ACLOCAL_AMFLAGS = -I m4 -EXTRA_DIST = bootstrap.sh git-version-gen LICENSE GPL LGPL doxygen/Makefile.am doxygen/Makefile.in doxygen/doxygen.conf.in README todo +EXTRA_DIST = \ + bootstrap.sh \ + git-version-gen \ + LICENSE \ + GPL \ + LGPL \ + doxygen/Makefile.am \ + doxygen/Makefile.in \ + doxygen/doxygen.conf.in \ + README \ + todo \ + vala/libpulse.vapi + SUBDIRS = src doxygen man po MAINTAINERCLEANFILES = noinst_DATA = +vapidir = $(datadir)/vala/vapi +vapi_DATA = vala/libpulse.vapi + pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libpulse.pc libpulse-simple.pc |