fixed make install

git-svn-id: https://svn.code.sf.net/p/freetel/code@352 01035d8c-6547-0410-b346-abe4f91aad63

diff --git a/codec2-dev/src/Makefile.am b/codec2-dev/src/Makefile.am
index b09cc6a27e7a15745ef059be89e37d442c8880ad..41881b222720755d6a29d382304ce3552619bdf5 100644 (file)
--- a/codec2-dev/src/Makefile.am
+++ b/codec2-dev/src/Makefile.am
@@ -119,22 +119,8 @@ codebookge.c
 libcodec2_la_CFLAGS = $(AM_CFLAGS)
 libcodec2_la_LDFLAGS = $(LIBS)
 
-library_includedir = $(prefix)
-library_include_HEADERS        = codec2.h \
-defines.h \
-kiss_fft.h\
-_kiss_fft_guts.h \
-fft.h \
-interp.h \
-lsp.h \
-phase.h \
-quantise.h \
-comp.h \
-dump.h \
-lpc.h \
-nlp.h  \
-postfilter.h \
-sine.h
+library_includedir = $(prefix)/include
+library_include_HEADERS        = codec2.h
 
 bin_PROGRAMS = c2demo c2enc c2dec c2sim
 

diff --git a/codec2-dev/src/Makefile.in b/codec2-dev/src/Makefile.in
index 9d4660fea4797b7cbd78cad9803afe796ddfa6e2..6d44219d7c4f48d206942468e72842d380ba6d47 100644 (file)
--- a/codec2-dev/src/Makefile.in
+++ b/codec2-dev/src/Makefile.in
@@ -298,23 +298,8 @@ codebookge.c
 
 libcodec2_la_CFLAGS = $(AM_CFLAGS)
 libcodec2_la_LDFLAGS = $(LIBS)
-library_includedir = $(prefix)
-library_include_HEADERS = codec2.h \
-defines.h \
-kiss_fft.h\
-_kiss_fft_guts.h \
-fft.h \
-interp.h \
-lsp.h \
-phase.h \
-quantise.h \
-comp.h \
-dump.h \
-lpc.h \
-nlp.h  \
-postfilter.h \
-sine.h
-
+library_includedir = $(prefix)/include
+library_include_HEADERS = codec2.h
 c2demo_SOURCES = c2demo.c
 c2demo_LDADD = $(lib_LTLIBRARIES) 
 c2demo_LDFLAGS = $(LIBS)

diff --git a/codec2-dev/unittest/Makefile.am b/codec2-dev/unittest/Makefile.am
index 2dac9eae7d995c4f739540b3dbdaa34ed21614e0..41b12834eee2c65d2c29f5d7bf5bff6017f4e2c9 100644 (file)
--- a/codec2-dev/unittest/Makefile.am
+++ b/codec2-dev/unittest/Makefile.am
@@ -3,8 +3,7 @@ AUTOMAKE_OPTS = gnu
 NAME = libcodec2
 AM_CPPFLAGS = $(AM_CFLAGS)
 
-bin_PROGRAMS = genres genlsp extract vqtrain vqtrainjnd tnlp tinterp tquant tcodec2 vq_train_jvm scalarlsptest
-
+noinst_PROGRAMS = genres genlsp extract vqtrain vqtrainjnd tnlp tinterp tquant tcodec2 vq_train_jvm scalarlsptest
 
 genres_SOURCES = genres.c ../src/lpc.c
 genres_LDADD = $(lib_LTLIBRARIES) 

diff --git a/codec2-dev/unittest/Makefile.in b/codec2-dev/unittest/Makefile.in
index 91735c9503492ef233172cb0f5387f8e2bde590f..94f4a037b26164f2a288143c1b935a297360e7ff 100644 (file)
--- a/codec2-dev/unittest/Makefile.in
+++ b/codec2-dev/unittest/Makefile.in
@@ -36,7 +36,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-bin_PROGRAMS = genres$(EXEEXT) genlsp$(EXEEXT) extract$(EXEEXT) \
+noinst_PROGRAMS = genres$(EXEEXT) genlsp$(EXEEXT) extract$(EXEEXT) \
        vqtrain$(EXEEXT) vqtrainjnd$(EXEEXT) tnlp$(EXEEXT) \
        tinterp$(EXEEXT) tquant$(EXEEXT) tcodec2$(EXEEXT) \
        vq_train_jvm$(EXEEXT) scalarlsptest$(EXEEXT)
@@ -48,9 +48,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)"
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-PROGRAMS = $(bin_PROGRAMS)
+PROGRAMS = $(noinst_PROGRAMS)
 am_extract_OBJECTS = extract.$(OBJEXT)
 extract_OBJECTS = $(am_extract_OBJECTS)
 extract_DEPENDENCIES =
@@ -299,30 +297,9 @@ $(top_srcdir)/configure:  $(am__configure_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-install-binPROGRAMS: $(bin_PROGRAMS)
-       @$(NORMAL_INSTALL)
-       test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
-       @list='$(bin_PROGRAMS)'; 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 $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-          $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
-         else :; fi; \
-       done
-
-uninstall-binPROGRAMS:
-       @$(NORMAL_UNINSTALL)
-       @list='$(bin_PROGRAMS)'; for p in $$list; do \
-         f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-         echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-         rm -f "$(DESTDIR)$(bindir)/$$f"; \
-       done
 
-clean-binPROGRAMS:
-       @list='$(bin_PROGRAMS)'; for p in $$list; do \
+clean-noinstPROGRAMS:
+       @list='$(noinst_PROGRAMS)'; for p in $$list; do \
          f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
          echo " rm -f $$p $$f"; \
          rm -f $$p $$f ; \
@@ -789,9 +766,6 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(PROGRAMS)
 installdirs:
-       for dir in "$(DESTDIR)$(bindir)"; do \
-         test -z "$$dir" || $(mkdir_p) "$$dir"; \
-       done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -818,7 +792,8 @@ maintainer-clean-generic:
        @echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
-clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
+clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
+       mostlyclean-am
 
 distclean: distclean-am
        -rm -rf ./$(DEPDIR)
@@ -838,7 +813,7 @@ info-am:
 
 install-data-am:
 
-install-exec-am: install-binPROGRAMS
+install-exec-am:
 
 install-info: install-info-am
 
@@ -864,19 +839,19 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am
+uninstall-am: uninstall-info-am
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-       clean-generic clean-libtool ctags distclean distclean-compile \
-       distclean-generic distclean-libtool distclean-tags distdir dvi \
-       dvi-am html html-am info info-am install install-am \
-       install-binPROGRAMS install-data install-data-am install-exec \
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+       clean-libtool clean-noinstPROGRAMS ctags distclean \
+       distclean-compile distclean-generic distclean-libtool \
+       distclean-tags distdir dvi dvi-am html html-am info info-am \
+       install install-am install-data install-data-am install-exec \
        install-exec-am install-info install-info-am install-man \
        install-strip installcheck installcheck-am installdirs \
        maintainer-clean maintainer-clean-generic mostlyclean \
        mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
        pdf pdf-am ps ps-am tags uninstall uninstall-am \
-       uninstall-binPROGRAMS uninstall-info-am
+       uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.