src/Makefile.am: define subdirectories to install headers in

diff --git a/src/Makefile.am b/src/Makefile.am
index 1431d8cdf320c5c392208ada79fc92cbc3465346..f6461a65f5f68a375f432fa726e0b38e106b1537 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,85 +3,76 @@ pkginclude_HEADERS = aubio.h \
        types.h \
        fvec.h \
        cvec.h \
-       mathutils.h \
+       mathutils.h
+
+pkgincludeutilsdir = $(pkgincludedir)/utils
+pkgincludetemporaldir = $(pkgincludedir)/temporal
+pkgincludespectraldir = $(pkgincludedir)/spectral
+pkgincludepitchdir = $(pkgincludedir)/pitch
+pkgincludeonsetdir = $(pkgincludedir)/onset
+pkgincludetempodir = $(pkgincludedir)/tempo
+
+pkgincludeutils_HEADERS = \
        utils/hist.h \
-       utils/scale.h \
+       utils/scale.h
+
+pkgincludetemporal_HEADERS = \
        temporal/resample.h \
        temporal/biquad.h \
-       temporal/filter.h \
+       temporal/filter.h
+
+pkgincludespectral_HEADERS = \
        spectral/filterbank.h \
-       spectral/mfcc.c \
+       spectral/mfcc.h \
        spectral/phasevoc.h \
        spectral/fft.h \
        spectral/tss.h \
-       spectral/spectral_centroid.h \
+       spectral/spectral_centroid.h
+
+pkgincludepitch_HEADERS = \
        pitch/pitchdetection.h \
        pitch/pitchmcomb.h \
        pitch/pitchyin.h \
        pitch/pitchschmitt.h \
        pitch/pitchfcomb.h \
-       pitch/pitchyinfft.h \
+       pitch/pitchyinfft.h
+
+pkgincludeonset_HEADERS =      \
        onset/onset.h \
        onset/onsetdetection.h \
-       onset/peakpick.h \
+       onset/peakpick.h
+
+pkgincludetempo_HEADERS =      \
        tempo/tempo.h \
        tempo/beattracking.h
 
-nodist_pkginclude_HEADERS = config.h
-
 lib_LTLIBRARIES = libaubio.la 
-libaubio_la_SOURCES = aubio.h \
-       types.h \
-       fvec.c \
-       fvec.h \
+libaubio_la_SOURCES = \
+  fvec.c \
        cvec.c \
-       cvec.h \
        mathutils.c \
-       mathutils.h \
        utils/hist.c \
-       utils/hist.h \
        utils/scale.c \
-       utils/scale.h \
        temporal/resample.c \
-       temporal/resample.h \
        temporal/biquad.c \
-       temporal/biquad.h \
        temporal/filter.c \
-       temporal/filter.h \
        spectral/filterbank.c \
-       spectral/filterbank.h \
-       spectral/mfcc.h \
        spectral/mfcc.c \
        spectral/phasevoc.c \
-       spectral/phasevoc.h \
        spectral/fft.c \
-       spectral/fft.h \
        spectral/tss.c \
-       spectral/tss.h \
        spectral/spectral_centroid.c \
-       spectral/spectral_centroid.h \
        pitch/pitchdetection.c \
-       pitch/pitchdetection.h \
        pitch/pitchmcomb.c \
-       pitch/pitchmcomb.h \
        pitch/pitchyin.c \
-       pitch/pitchyin.h \
        pitch/pitchschmitt.c \
-       pitch/pitchschmitt.h \
        pitch/pitchfcomb.c \
-       pitch/pitchfcomb.h \
        pitch/pitchyinfft.c \
-       pitch/pitchyinfft.h \
        onset/onset.c \
-       onset/onset.h \
        onset/onsetdetection.c \
-       onset/onsetdetection.h \
        onset/peakpick.c \
-       onset/peakpick.h \
        tempo/tempo.c \
-       tempo/tempo.h \
-       tempo/beattracking.c \
-       tempo/beattracking.h
+       tempo/beattracking.c
 
 AM_CFLAGS = @AUBIO_CFLAGS@ @FFTWLIB_CFLAGS@ @SAMPLERATE_CFLAGS@
 libaubio_la_LIBADD = @FFTWLIB_LIBS@ @SAMPLERATE_LIBS@ @LTLIBOBJS@