diff options
| author |  Dan Dennedy
| 2008-04-22 10:51:50 -0700 |
|---|---|---|
| committer | Dan Dennedy
| 2008-04-22 10:51:50 -0700 |
| commit | 7c4d4970543f1829e783cc2bea2421913cc23a04 (patch) | |
| tree | 96697b7ba341760df6f5bf745a102938d509a9bc /Makefile.am | |
| parent | Merge branch 'master' of dennedy.org:git/dennedy.org/libraw1394 (diff) | |
| parent | Set handle->iso.packets to NULL after freeing to avoid double-frees. (diff) | |
Merge commit 'krh/juju'
Conflicts:
configure.ac
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 04ed38a..21df527 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,7 @@ # process this file with automake to create a Makefile.in -SUBDIRS = src tools doc debian +SUBDIRS = $(LIB_SUBDIR) tools doc debian +DIST_SUBDIRS = src juju pkgconfigdir = @libdir@/pkgconfig pkgconfig_DATA = libraw1394.pc |