Changeset 235

Timestamp:

02/23/08 15:50:37 (4 years ago)

Author:

ath

Message:

Clean up the rubberband source files.

Location:

trunk/rubberband

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (11 diffs)
• configure (modified) (2 diffs)
• configure.ac (modified) (1 diff)
• include/Makefile.am (modified) (1 diff)
• include/Makefile.in (modified) (1 diff)
• lib/librubberband.so (deleted)
• rubberband.pc.in (modified) (1 diff)
• src/ladspa/RubberBandPitchShifter.cpp (deleted)
• src/ladspa/RubberBandPitchShifter.h (deleted)
• src/ladspa/ladspa-rubberband.cat (deleted)
• src/ladspa/libmain.cpp (deleted)
• src/main.cpp (deleted)
• src/vamp/RubberBandVampPlugin.cpp (deleted)
• src/vamp/RubberBandVampPlugin.h (deleted)
• src/vamp/libmain.cpp (deleted)
• src/vamp/vamp-rubberband.cat (deleted)

trunk/rubberband/Makefile.am

@@ -1 +1 @@
 SUBDIRS = include src
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = rubberband.pc

trunk/rubberband/Makefile.in

@@ -14 +14 @@
 
 @SET_MAKE@
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
@@ -34 +35 @@
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-        $(srcdir)/Makefile.in $(top_srcdir)/configure AUTHORS COPYING \
-        ChangeLog INSTALL NEWS config.guess config.sub depcomp \
-        install-sh ltmain.sh missing
+        $(srcdir)/Makefile.in $(srcdir)/rubberband.pc.in \
+        $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
+        config.guess config.sub depcomp install-sh ltmain.sh missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -44 +45 @@
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = rubberband.pc
 SOURCES =
 DIST_SOURCES =
@@ -54 +55 @@
         installcheck-recursive installdirs-recursive pdf-recursive \
         ps-recursive uninstall-recursive
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(pkgconfigdir)"
+pkgconfigDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(pkgconfig_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
   distclean-recursive maintainer-clean-recursive
@@ -182 +192 @@
 top_srcdir = @top_srcdir@
 SUBDIRS = include src
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = rubberband.pc
 all: all-recursive
 
@@ -218 +230 @@
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
         cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+rubberband.pc: $(top_builddir)/config.status $(srcdir)/rubberband.pc.in
+        cd $(top_builddir) && $(SHELL) ./config.status $@
 
 mostlyclean-libtool:
@@ -227 +241 @@
 distclean-libtool:
         -rm -f libtool
+install-pkgconfigDATA: $(pkgconfig_DATA)
+        @$(NORMAL_INSTALL)
+        test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
+        @list='$(pkgconfig_DATA)'; for p in $$list; do \
+          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+          f=$(am__strip_dir) \
+          echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
+          $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \
+        done
+
+uninstall-pkgconfigDATA:
+        @$(NORMAL_UNINSTALL)
+        @list='$(pkgconfig_DATA)'; for p in $$list; do \
+          f=$(am__strip_dir) \
+          echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
+          rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \
+        done
 
 # This directory's subdirectories are mostly independent; you can cd
@@ -503 +534 @@
 check-am: all-am
 check: check-recursive
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
+        for dir in "$(DESTDIR)$(pkgconfigdir)"; do \
+          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+        done
 install: install-recursive
 install-exec: install-exec-recursive
@@ -550 +584 @@
 info-am:
 
-install-data-am:
+install-data-am: install-pkgconfigDATA
 
 install-dvi: install-dvi-recursive
@@ -586 +620 @@
 ps-am:
 
-uninstall-am:
+uninstall-am: uninstall-pkgconfigDATA
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
@@ -601 +635 @@
         install-exec-am install-html install-html-am install-info \
         install-info-am install-man install-pdf install-pdf-am \
-        install-ps install-ps-am install-strip installcheck \
-        installcheck-am installdirs installdirs-am maintainer-clean \
-        maintainer-clean-generic mostlyclean mostlyclean-generic \
-        mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-        uninstall uninstall-am
+        install-pkgconfigDATA install-ps install-ps-am install-strip \
+        installcheck installcheck-am installdirs installdirs-am \
+        maintainer-clean maintainer-clean-generic mostlyclean \
+        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+        tags tags-recursive uninstall uninstall-am \
+        uninstall-pkgconfigDATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

trunk/rubberband/configure

@@ -20927 +20927 @@
 fi
 
-ac_config_files="$ac_config_files Makefile include/Makefile src/Makefile"
+ac_config_files="$ac_config_files Makefile rubberband.pc include/Makefile src/Makefile"
 
 cat >confcache <<\_ACEOF
@@ -21537 +21537 @@
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+    "rubberband.pc") CONFIG_FILES="$CONFIG_FILES rubberband.pc" ;;
     "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;

trunk/rubberband/configure.ac

@@ -37 +37 @@
 
 AC_CONFIG_FILES([Makefile
+                 rubberband.pc
                  include/Makefile
                  src/Makefile])

trunk/rubberband/include/Makefile.am

@@ -4 +4 @@
         TimeStretcher.h \
         RubberBandStretcher.h
+
+EXTRA_DIST = $(librubberband_include_DATA)

trunk/rubberband/include/Makefile.in

@@ -169 +169 @@
         RubberBandStretcher.h
 
+EXTRA_DIST = $(librubberband_include_DATA)
 all: all-am
 

trunk/rubberband/rubberband.pc.in

@@ -1 @@
-prefix=%PREFIX%
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
 
 Name: rubberband
 Version: 1.0
 Description: 
-Libs: -L${libdir} -lrubberband
-Cflags: -I${includedir} 
+Libs: -L@libdir@ -lrubberband
+Cflags: -I@includedir@