openharmony/third_party_libsnd
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_libsnd synced 2024-11-23 01:49:53 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

More 'make distcheck'fixes.

Browse Source
This commit is contained in:
Erik de Castro Lopo 2007-08-25 18:58:47 +10:00
parent 61d849e7f3
commit ece63c6b49
2 changed files with 34 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
M4/octave_build.m4
View File

@ -31,8 +31,8 @@ if test "x$prog_concat" = "xyesyesyes" ; then
AC_MSG_WARN([** Mismatch between versions of octave and octave-config. **])
AC_MSG_WARN([** Octave libsndfile modules will not be built. **])
else
OCTAVE_ODIR=`$OCTAVE_CONFIG --oct-site-dir`
OCTAVE_MDIR=`$OCTAVE_CONFIG --m-site-dir`
OCTAVE_DEST_ODIR=`$OCTAVE_CONFIG --oct-site-dir | sed 's%^/usr%${prefix}%'`
OCTAVE_DEST_MDIR=`$OCTAVE_CONFIG --m-site-dir | sed 's%^/usr%${prefix}%'`
AC_MSG_RESULT([retrieving compile and link flags from $MKOCTFILE])
OCT_CXXFLAGS=`$MKOCTFILE -p ALL_CXXFLAGS`
@ -44,8 +44,8 @@ if test "x$prog_concat" = "xyesyesyes" ; then
fi
fi
AC_SUBST(OCTAVE_ODIR)
AC_SUBST(OCTAVE_MDIR)
AC_SUBST(OCTAVE_DEST_ODIR)
AC_SUBST(OCTAVE_DEST_MDIR)
AC_SUBST(OCT_CXXFLAGS)
AC_SUBST(OCT_LIB_DIR)

38
Octave/Makefile.am
View File

@ -8,18 +8,20 @@ EXTRA_DIST = sndfile_load.m sndfile_save.m sndfile_play.m
octconfigdir = $(exec_prefix)/share/octave/site/m
octconfig_DATA = sndfile_load.m sndfile_save.m sndfile_play.m
OCT_CXXFLAGS = $(shell $(MKOCTFILE) -p ALL_CXXFLAGS)
OCTAVE_DEST_MDIR = @OCTAVE_DEST_MDIR@
OCTAVE_DEST_ODIR = @OCTAVE_DEST_ODIR@
# OCT_LIB_DIR = $(shell $(MKOCTFILE) -p LFLAGS)
# OCT_LIBS = $(shell $(MKOCTFILE) -p OCTAVE_LIBS)
OCT_LIB_DIR = -L/usr/lib/octave-2.9.9
OCT_LIBS = -loctinterp -loctave -lcruft
OCT_CXXFLAGS = @OCT_CXXFLAGS@
OCT_LIB_DIR = @OCT_LIB_DIR@
OCT_LIBS = @OCT_LIBS@
SNDFILEDIR = ../src
INCLUDES = -I$(srcdir)/$(SNDFILEDIR)
bin_PROGRAMS = sfread.oct
oct_modules = sfread.oct sfwrite.oct
# Make these noinst so they can be installed manually.
noinst_PROGRAMS = $(oct_modules)
noinst_HEADERS = format.h
@ -27,8 +29,28 @@ sfread_oct_SOURCES = format.cc sfread.cc
sfread_oct_CXXFLAGS = $(OCT_CXXFLAGS) $(INCLUDES)
sfread_oct_LDADD = $(OCT_LIB_DIR) $(OCT_LIBS) $(SNDFILEDIR)/libsndfile.la
sfwrite_oct_SOURCES = format.cc sfwrite.cc
sfwrite_oct_CXXFLAGS = $(OCT_CXXFLAGS) $(INCLUDES)
sfwrite_oct_LDADD = $(OCT_LIB_DIR) $(OCT_LIBS) $(SNDFILEDIR)/libsndfile.la
install-exec-local : $(oct_modules)
@$(NORMAL_INSTALL)
test -z "$(OCTAVE_DEST_ODIR)" || $(mkdir_p) "$(DESTDIR)$(OCTAVE_DEST_ODIR)"
@list='$(oct_modules)'; for p in $$list; do \
p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
if test -f $$p \
|| test -f $$p1 \
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL) '$$p' '$(DESTDIR)$(OCTAVE_DEST_ODIR)/$$f'"; \
$(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL) "$$p" "$(DESTDIR)$(OCTAVE_DEST_ODIR)/$$f" || exit 1; \
else :; fi; \
done
uninstall-local :
@$(NORMAL_UNINSTALL)
@list='$(oct_modules)'; for p in $$list; do \
f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
echo " rm -f '$(DESTDIR)$(OCTAVE_DEST_ODIR)/$$f'"; \
rm -f "$(DESTDIR)$(OCTAVE_DEST_ODIR)/$$f"; \
done