Changeset b63b322

Timestamp:

Dec 1, 2007, 4:00:37 PM (17 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

974dddc

Parents:

55e9018 (diff), 554a9cb (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

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

File:

• src/Makefile.am (modified) (2 diffs)

src/Makefile.am

@@ -4 +4 @@
         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 \
@@ -21 +36 @@
         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@