[gtkglext] Replace LT_* with GTKGLEXT_* (Avoid namespace clash with libtool)



commit 0e5a3537c7e7c3cc5f3782adc928e2043a870c4f
Author: Ralf Corsepius <rcorsepius src gnome org>
Date:   Tue Dec 22 16:33:57 2009 +0100

    Replace LT_* with GTKGLEXT_* (Avoid namespace clash with libtool)

 configure.ac    |   20 ++++++++++----------
 gdk/Makefile.am |    4 ++--
 gtk/Makefile.am |    4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 8e3cdb7..fae827c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -85,16 +85,16 @@ AC_SUBST([API_MJ])
 AC_SUBST([API_MI])
 
 # libtool versioning
-LT_RELEASE=gtkglext_lt_release
-LT_CURRENT=gtkglext_lt_current
-LT_REVISION=gtkglext_lt_revision
-LT_AGE=gtkglext_lt_age
-LT_CURRENT_MINUS_AGE=gtkglext_lt_current_minus_age
-AC_SUBST([LT_RELEASE])
-AC_SUBST([LT_CURRENT])
-AC_SUBST([LT_REVISION])
-AC_SUBST([LT_AGE])
-AC_SUBST([LT_CURRENT_MINUS_AGE])
+GTKGLEXT_RELEASE=gtkglext_lt_release
+GTKGLEXT_CURRENT=gtkglext_lt_current
+GTKGLEXT_REVISION=gtkglext_lt_revision
+GTKGLEXT_AGE=gtkglext_lt_age
+GTKGLEXT_CURRENT_MINUS_AGE=gtkglext_lt_current_minus_age
+AC_SUBST([GTKGLEXT_RELEASE])
+AC_SUBST([GTKGLEXT_CURRENT])
+AC_SUBST([GTKGLEXT_REVISION])
+AC_SUBST([GTKGLEXT_AGE])
+AC_SUBST([GTKGLEXT_CURRENT_MINUS_AGE])
 
 # Checks for programs.
 
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 1828b7d..28ade8e 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -21,7 +21,7 @@ if MS_LIB_AVAILABLE
 noinst_DATA = gdkglext-win32- GTKGLEXT_API_VERSION@.lib
 
 gdkglext-win32- GTKGLEXT_API_VERSION@.lib: libgdkglext-win32- GTKGLEXT_API_VERSION@.la $(gdkglext_def)
-	lib -name:libgdkglext-win32- GTKGLEXT_API_VERSION@- LT_CURRENT_MINUS_AGE@.dll -def:$(gdkglext_def) -out:$@
+	lib -name:libgdkglext-win32- GTKGLEXT_API_VERSION@- GTKGLEXT_CURRENT_MINUS_AGE@.dll -def:$(gdkglext_def) -out:$@
 
 install-ms-lib:
 	$(INSTALL) gdkglext-win32- GTKGLEXT_API_VERSION@.lib $(DESTDIR)$(libdir)
@@ -47,7 +47,7 @@ common_includes = \
 	-DGDK_PIXBUF_DISABLE_DEPRECATED
 
 common_ldflags = \
-	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	\
+	-version-info $(GTKGLEXT_CURRENT):$(GTKGLEXT_REVISION):$(GTKGLEXT_AGE) 	\
 	-export-dynamic 					\
 	-rpath $(libdir) 					\
 	$(no_undefined)						\
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 7b2ecce..6d379a0 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -18,7 +18,7 @@ if MS_LIB_AVAILABLE
 noinst_DATA = gtkglext-win32- GTKGLEXT_API_VERSION@.lib
 
 gtkglext-win32- GTKGLEXT_API_VERSION@.lib: libgtkglext-win32- GTKGLEXT_API_VERSION@.la $(gtkglext_def)
-	lib -name:libgtkglext-win32- GTKGLEXT_API_VERSION@- LT_CURRENT_MINUS_AGE@.dll -def:$(gtkglext_def) -out:$@
+	lib -name:libgtkglext-win32- GTKGLEXT_API_VERSION@- GTKGLEXT_CURRENT_MINUS_AGE@.dll -def:$(gtkglext_def) -out:$@
 
 install-ms-lib:
 	$(INSTALL) gtkglext-win32- GTKGLEXT_API_VERSION@.lib $(DESTDIR)$(libdir)
@@ -45,7 +45,7 @@ common_includes = \
 	-DGTK_DISABLE_DEPRECATED
 
 common_ldflags = \
-	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	\
+	-version-info $(GTKGLEXT_CURRENT):$(GTKGLEXT_REVISION):$(GTKGLEXT_AGE) 	\
 	-export-dynamic 					\
 	-rpath $(libdir) 					\
 	$(no_undefined)						\



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