Makefile fixes
authorJean-Marc Valin <jean-marc.valin@usherbrooke.ca>
Tue, 2 Aug 2011 12:13:42 +0000 (08:13 -0400)
committerJean-Marc Valin <jean-marc.valin@usherbrooke.ca>
Tue, 2 Aug 2011 12:13:42 +0000 (08:13 -0400)
silk_sources.mk no longer needs to be patched (s/if/ifdef/) for
the draft Makefile to work.

Makefile.am
Makefile.draft
doc/build_draft.sh
silk_sources.mk

index 7df07c8..76490f7 100644 (file)
@@ -6,6 +6,12 @@ include celt_sources.mk
 include silk_sources.mk
 include opus_sources.mk
 
+if FIXED_POINT
+SILK_SOURCES += $(SILK_SOURCES_FIXED)
+else
+SILK_SOURCES += $(SILK_SOURCES_FLOAT)
+endif
+
 include celt_headers.txt
 include silk_headers.txt
 include opus_headers.txt
index 85be807..f68b048 100644 (file)
@@ -23,6 +23,12 @@ include silk_sources.mk
 include celt_sources.mk
 include opus_sources.mk
 
+ifdef FIXED_POINT
+SILK_SOURCES += $(SILK_SOURCES_FIXED)
+else
+SILK_SOURCES += $(SILK_SOURCES_FLOAT)
+endif
+
 EXESUFFIX =
 LIBPREFIX = lib
 LIBSUFFIX = .a
index d474819..f5b1da1 100755 (executable)
@@ -28,8 +28,7 @@ cp -a "${toplevel}"/src/opus_custom.h "${destdir}"/src/
 cp -a "${toplevel}"/Makefile.draft "${destdir}"/Makefile
 cp -a "${toplevel}"/opus_sources.mk "${destdir}"/
 cp -a "${toplevel}"/celt_sources.mk "${destdir}"/
-cat "${toplevel}"/silk_sources.mk | sed 's/^if /ifdef /' \
- > "${destdir}"/silk_sources.mk
+cp -a "${toplevel}"/silk_sources.mk "${destdir}"/
 cp -a "${toplevel}"/README.draft "${destdir}"/README
 cp -a "${toplevel}"/COPYING "${destdir}"/COPYING
 
index a263c7c..2e3151f 100644 (file)
@@ -94,8 +94,7 @@ silk/silk_stereo_find_predictor.c \
 silk/silk_stereo_quant_pred.c
 
 
-if FIXED_POINT
-SILK_SOURCES += \
+SILK_SOURCES_FIXED = \
 silk/fixed/silk_LTP_analysis_filter_FIX.c \
 silk/fixed/silk_LTP_scale_ctrl_FIX.c \
 silk/fixed/silk_corrMatrix_FIX.c \
@@ -112,8 +111,8 @@ silk/fixed/silk_residual_energy16_FIX.c \
 silk/fixed/silk_residual_energy_FIX.c \
 silk/fixed/silk_solve_LS_FIX.c \
 silk/fixed/silk_warped_autocorrelation_FIX.c
-else
-SILK_SOURCES += \
+
+SILK_SOURCES_FLOAT = \
 silk/float/silk_apply_sine_window_FLP.c \
 silk/float/silk_corrMatrix_FLP.c \
 silk/float/silk_encode_frame_FLP.c \
@@ -145,4 +144,3 @@ silk/float/silk_scale_copy_vector_FLP.c \
 silk/float/silk_scale_vector_FLP.c \
 silk/float/silk_schur_FLP.c \
 silk/float/silk_sort_FLP.c
-endif