[SCM] opencore-amr packaging branch, master, updated. upstream/0.1.2-10-g7bf1e45

ceros-guest at users.alioth.debian.org ceros-guest at users.alioth.debian.org
Fri Sep 18 20:48:57 UTC 2009 

The following commit has been merged in the master branch:
commit 37dc8a5da0199a122e7755d5738fa322bb97b580
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Tue Aug 4 15:14:22 2009 -0400

    Autogenerate pkgconfig files using autotools. Also fix package version to match library versioning.

diff --git a/amrnb/Makefile.in b/amrnb/Makefile.in
index 1ac3066..094b128 100644
--- a/amrnb/Makefile.in
+++ b/amrnb/Makefile.in
@@ -37,7 +37,7 @@ host_triplet = @host@
 @COMPILE_AS_C_TRUE at am__append_1 = -x c -std=c99
 subdir = amrnb
 DIST_COMMON = $(amrnbinclude_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
+	$(srcdir)/Makefile.in $(srcdir)/opencore-amrnb.pc.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
@@ -47,7 +47,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = opencore-amrnb.pc
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -459,6 +459,8 @@ $(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
+opencore-amrnb.pc: $(top_builddir)/config.status $(srcdir)/opencore-amrnb.pc.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
diff --git a/amrnb/opencore-amrnb.pc b/amrnb/opencore-amrnb.pc
deleted file mode 100644
index 8a12844..0000000
--- a/amrnb/opencore-amrnb.pc
+++ /dev/null
@@ -1,14 +0,0 @@
-prefix=PREFIX
-exec_prefix=${prefix}
-libdir=${prefix}/LIBDIR
-includedir=${prefix}/include
-
-Name: OpenCORE AMR-NB
-Description: Adaptive Multi-Rate speech codec library
-Version: VERSION
-Requires:
-Requires.private:
-Conflicts:
-Libs: -L${libdir} -lopencore-amrnb
-Libs.private:
-Cflags: -I${includedir}
diff --git a/amrnb/opencore-amrnb.pc.in b/amrnb/opencore-amrnb.pc.in
new file mode 100644
index 0000000..b838c0d
--- /dev/null
+++ b/amrnb/opencore-amrnb.pc.in
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@/opencore-amrnb
+
+Name: OpenCORE AMR-NB
+Description: Adaptive Multi-Rate speech codec library
+Version: @PACKAGE_VERSION@
+Libs: -L${libdir} -lopencore-amrnb
+Cflags: -I${includedir}
diff --git a/amrwb/Makefile.in b/amrwb/Makefile.in
index 1f19b71..e03544f 100644
--- a/amrwb/Makefile.in
+++ b/amrwb/Makefile.in
@@ -37,7 +37,7 @@ host_triplet = @host@
 @COMPILE_AS_C_TRUE at am__append_1 = -x c -std=c99
 subdir = amrwb
 DIST_COMMON = $(amrwbinclude_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
+	$(srcdir)/Makefile.in $(srcdir)/opencore-amrwb.pc.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
@@ -47,7 +47,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = opencore-amrwb.pc
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -311,6 +311,8 @@ $(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
+opencore-amrwb.pc: $(top_builddir)/config.status $(srcdir)/opencore-amrwb.pc.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
diff --git a/amrwb/opencore-amrwb.pc b/amrwb/opencore-amrwb.pc
deleted file mode 100644
index 42e3035..0000000
--- a/amrwb/opencore-amrwb.pc
+++ /dev/null
@@ -1,14 +0,0 @@
-prefix=PREFIX
-exec_prefix=${prefix}
-libdir=${prefix}/LIBDIR
-includedir=${prefix}/include
-
-Name: OpenCORE AMR-WB
-Description: Adaptive Multi-Rate Wideband speech codec library
-Version: VERSION
-Requires:
-Requires.private:
-Conflicts:
-Libs: -L${libdir} -lopencore-amrwb
-Libs.private:
-Cflags: -I${includedir}
diff --git a/amrwb/opencore-amrwb.pc.in b/amrwb/opencore-amrwb.pc.in
new file mode 100644
index 0000000..8446310
--- /dev/null
+++ b/amrwb/opencore-amrwb.pc.in
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@/opencore-amrwb
+
+Name: OpenCORE AMR-WB
+Description: Adaptive Multi-Rate Wideband speech codec library
+Version: @PACKAGE_VERSION@
+Libs: -L${libdir} -lopencore-amrwb
+Cflags: -I${includedir}
diff --git a/configure b/configure
index 7148723..b11e2d8 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.64 for opencore-amr 0.1.2.
+# Generated by GNU Autoconf 2.64 for opencore-amr 0.0.2.
 #
 # Report bugs to <https://sourceforge.net/apps/trac/opencore-amr/>.
 #
@@ -698,8 +698,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='opencore-amr'
 PACKAGE_TARNAME='opencore-amr'
-PACKAGE_VERSION='0.1.2'
-PACKAGE_STRING='opencore-amr 0.1.2'
+PACKAGE_VERSION='0.0.2'
+PACKAGE_STRING='opencore-amr 0.0.2'
 PACKAGE_BUGREPORT='https://sourceforge.net/apps/trac/opencore-amr/'
 PACKAGE_URL=''
 
@@ -1424,7 +1424,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures opencore-amr 0.1.2 to adapt to many kinds of systems.
+\`configure' configures opencore-amr 0.0.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1494,7 +1494,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of opencore-amr 0.1.2:";;
+     short | recursive ) echo "Configuration of opencore-amr 0.0.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1597,7 +1597,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-opencore-amr configure 0.1.2
+opencore-amr configure 0.0.2
 generated by GNU Autoconf 2.64
 
 Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2266,7 +2266,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by opencore-amr $as_me 0.1.2, which was
+It was created by opencore-amr $as_me 0.0.2, which was
 generated by GNU Autoconf 2.64.  Invocation command line was
 
   $ $0 $@
@@ -2946,7 +2946,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='opencore-amr'
- VERSION='0.1.2'
+ VERSION='0.0.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -14830,7 +14830,7 @@ OPENCORE_AMRWB_VERSION=0:2:0
 
 
 
-ac_config_files="$ac_config_files Makefile amrnb/Makefile amrwb/Makefile"
+ac_config_files="$ac_config_files Makefile amrnb/Makefile amrwb/Makefile amrnb/opencore-amrnb.pc amrwb/opencore-amrwb.pc"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -15357,7 +15357,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by opencore-amr $as_me 0.1.2, which was
+This file was extended by opencore-amr $as_me 0.0.2, which was
 generated by GNU Autoconf 2.64.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15421,7 +15421,7 @@ Report bugs to <https://sourceforge.net/apps/trac/opencore-amr/>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-opencore-amr config.status 0.1.2
+opencore-amr config.status 0.0.2
 configured by $0, generated by GNU Autoconf 2.64,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -15899,6 +15899,8 @@ do
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "amrnb/Makefile") CONFIG_FILES="$CONFIG_FILES amrnb/Makefile" ;;
     "amrwb/Makefile") CONFIG_FILES="$CONFIG_FILES amrwb/Makefile" ;;
+    "amrnb/opencore-amrnb.pc") CONFIG_FILES="$CONFIG_FILES amrnb/opencore-amrnb.pc" ;;
+    "amrwb/opencore-amrwb.pc") CONFIG_FILES="$CONFIG_FILES amrwb/opencore-amrwb.pc" ;;
 
   *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
diff --git a/configure.ac b/configure.ac
index 88b6670..f8c9288 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([opencore-amr], [0.1.2], [https://sourceforge.net/apps/trac/opencore-amr/])
+AC_INIT([opencore-amr], [0.0.2], [https://sourceforge.net/apps/trac/opencore-amr/])
 AC_CONFIG_AUX_DIR(.)
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE
@@ -64,5 +64,7 @@ AC_SUBST(OPENCORE_AMRWB_VERSION)
 
 AC_CONFIG_FILES([Makefile
                  amrnb/Makefile
-                 amrwb/Makefile])
+                 amrwb/Makefile
+                 amrnb/opencore-amrnb.pc
+                 amrwb/opencore-amrwb.pc])
 AC_OUTPUT

-- 
opencore-amr packaging

More information about the pkg-multimedia-commits mailing list