[librsvgmm] Substitute API version into Automake variable name



commit 79c382d09209fd180b2bff710a646763499a27ea
Author: Daniel Elstner <daniel kitta gmail com>
Date:   Wed Aug 19 22:47:01 2009 +0200

    Substitute API version into Automake variable name
    
    * librsvg/librsvgmm.pc.in: Rename file from librsvgmm-2.0.pc.in.
    * librsvg/librsvgmm-uninstalled.pc.in: Rename file from
    librsvgmm-2.0-uninstalled.pc.in.
    * configure.ac (AC_CONFIG_FILES): Substitute the module name into the
    pkg-config filenames from the $LIBRSVGMM_MODULE_NAME shell variable,
    and specify the renamed generic input files explicitly.
    * Makefile.am (pkgconfig_DATA): Referene the module name indirectly.
    (DISTCLEANFILES): Explicitly list the generated pkg-config files.
    * librsvg/librsvgmm/Makefile.am (lib_LTLIBRARIES): Substitute
    @LIBRSVGMM_API_VERSION@ into the libtool archive filename.  Rename
    the _SOURCES, _LDFLAGS and _LIBADD variables accordingly, i.e. use
    a substitution as part of the variable name itself.

 Makefile.am                                        |    6 +++++-
 configure.ac                                       |    4 ++--
 ...installed.pc.in => librsvgmm-uninstalled.pc.in} |    0
 librsvg/{librsvgmm-2.0.pc.in => librsvgmm.pc.in}   |    0
 librsvg/librsvgmm/Makefile.am                      |    8 ++++----
 5 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 14b5283..a0442a3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,6 +33,10 @@ SUBDIRS = $(src_subdirs) librsvg/librsvgmm $(doc_subdirs)
 dist_noinst_SCRIPTS = autogen.sh
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = librsvg/librsvgmm-2.0.pc
+pkgconfig_DATA = librsvg/$(LIBRSVGMM_MODULE_NAME).pc
+
+DISTCLEANFILES = \
+	librsvg/$(LIBRSVGMM_MODULE_NAME).pc \
+	librsvg/$(LIBRSVGMM_MODULE_NAME)-uninstalled.pc
 
 include $(top_srcdir)/build/dist-changelog.am
diff --git a/configure.ac b/configure.ac
index 9532dcf..00d21ed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,8 +59,8 @@ MM_ARG_ENABLE_WARNINGS([LIBRSVGMM_WXXFLAGS],
 
 AC_CONFIG_FILES([Makefile
                  codegen/Makefile
-                 librsvg/librsvgmm-2.0.pc
-                 librsvg/librsvgmm-2.0-uninstalled.pc
+                 librsvg/$LIBRSVGMM_MODULE_NAME.pc:librsvg/librsvgmm.pc.in
+                 librsvg/$LIBRSVGMM_MODULE_NAME-uninstalled.pc:librsvg/librsvgmm-uninstalled.pc.in
                  librsvg/src/Makefile
                  librsvg/librsvgmm/Makefile
                  doc/Makefile
diff --git a/librsvg/librsvgmm-2.0-uninstalled.pc.in b/librsvg/librsvgmm-uninstalled.pc.in
similarity index 100%
rename from librsvg/librsvgmm-2.0-uninstalled.pc.in
rename to librsvg/librsvgmm-uninstalled.pc.in
diff --git a/librsvg/librsvgmm-2.0.pc.in b/librsvg/librsvgmm.pc.in
similarity index 100%
rename from librsvg/librsvgmm-2.0.pc.in
rename to librsvg/librsvgmm.pc.in
diff --git a/librsvg/librsvgmm/Makefile.am b/librsvg/librsvgmm/Makefile.am
index 22ebf85..57e0303 100644
--- a/librsvg/librsvgmm/Makefile.am
+++ b/librsvg/librsvgmm/Makefile.am
@@ -15,7 +15,7 @@
 ## You should have received a copy of the GNU Lesser General Public License
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-lib_LTLIBRARIES = librsvgmm-2.0.la
+lib_LTLIBRARIES = librsvgmm- LIBRSVGMM_API_VERSION@.la
 
 include $(srcdir)/../src/filelist.am
 include $(srcdir)/filelist.am
@@ -26,6 +26,6 @@ local_cppflags = $(binding_includes) $(binding_cppflags) -DLIBRSVGMM_BUILD=1
 AM_CPPFLAGS = $(local_cppflags) $(GTHREAD_CFLAGS) $(LIBRSVGMM_CFLAGS)
 AM_CXXFLAGS = $(LIBRSVGMM_WXXFLAGS)
 
-librsvgmm_2_0_la_SOURCES = $(binding_sources)
-librsvgmm_2_0_la_LDFLAGS = -no-undefined -version-info $(LIBRSVGMM_SO_VERSION)
-librsvgmm_2_0_la_LIBADD  = $(LIBRSVGMM_LIBS)
+librsvgmm_ LIBRSVGMM_API_VERSION@_la_SOURCES = $(binding_sources)
+librsvgmm_ LIBRSVGMM_API_VERSION@_la_LDFLAGS = -no-undefined -version-info $(LIBRSVGMM_SO_VERSION)
+librsvgmm_ LIBRSVGMM_API_VERSION@_la_LIBADD  = $(LIBRSVGMM_LIBS)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]