diff options
| author | paul <paul@0c269be4-1314-0410-8aa9-9f06e86f4224> | 2011-06-29 01:50:30 +0000 |
|---|---|---|
| committer | paul <paul@0c269be4-1314-0410-8aa9-9f06e86f4224> | 2011-06-29 01:50:30 +0000 |
| commit | b8db6d6518b354438d63b6e9c8e3dfa714e80ccb (patch) | |
| tree | 08c7765b0b1615b9c221114d203da6d4cc817bae | |
| parent | 3cc3f1734a06cc7e1072ef8b0bc65672e6d3d732 (diff) | |
| download | jack1-b8db6d6518b354438d63b6e9c8e3dfa714e80ccb.tar.gz | |
changes required for 0.121.[12]
git-svn-id: svn+ssh://jackaudio.org/trunk/jack@4474 0c269be4-1314-0410-8aa9-9f06e86f4224
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | jack/Makefile.am | 8 | ||||
| -rw-r--r-- | python/Makefile.am | 3 |
4 files changed, 12 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index 68fba83..c526540 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,13 +13,13 @@ dist-check-doxygen: @false endif -SUBDIRS = jack libjack jackd drivers example-clients tools config $(DOC_DIR) man -DIST_SUBDIRS = config jack libjack jackd drivers example-clients tools doc man +SUBDIRS = jack libjack jackd drivers example-clients tools config $(DOC_DIR) man python +DIST_SUBDIRS = config jack libjack jackd drivers example-clients tools doc man python pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = jack.pc -EXTRA_DIST = COPYING COPYING.GPL COPYING.LGPL libjack/simd.c jack.spec python/*.py +EXTRA_DIST = COPYING COPYING.GPL COPYING.LGPL libjack/simd.c jack.spec AUTOMAKE_OPTIONS = foreign diff --git a/configure.ac b/configure.ac index 26b68bb..5841079 100644 --- a/configure.ac +++ b/configure.ac @@ -62,7 +62,7 @@ dnl changes are made dnl --- JACK_MAJOR_VERSION=0 JACK_MINOR_VERSION=121 -JACK_MICRO_VERSION=0 +JACK_MICRO_VERSION=1 dnl --- dnl HOWTO: updating the jack protocol version @@ -967,6 +967,7 @@ jack/version.h jackd/Makefile jackd/jackd.1 libjack/Makefile +python/Makefile ) dnl diff --git a/jack/Makefile.am b/jack/Makefile.am index 0887709..403eca4 100644 --- a/jack/Makefile.am +++ b/jack/Makefile.am @@ -11,10 +11,10 @@ libjackinclude_HEADERS = \ thread.h \ timestamps.h \ transport.h \ - types.h \ - midiport.h \ - weakmacros.h \ - weakjack.h \ + types.h \ + midiport.h \ + weakmacros.h \ + weakjack.h \ control.h noinst_HEADERS = \ diff --git a/python/Makefile.am b/python/Makefile.am new file mode 100644 index 0000000..19238bc --- /dev/null +++ b/python/Makefile.am @@ -0,0 +1,3 @@ +noinst_SCRIPTS = jackd.py +EXTRA_DIST = jackd.py jackctl.pyc mygetopt.pyc reserve_audio.py + |