[gtkglarea/jjardon/gtk3: 14/16] Change .pc file



commit 5e544a2c5804e71543c8d7af5b517d4cbe085599
Author: Javier Jardón <jjardon gnome org>
Date:   Mon Mar 24 18:33:01 2014 +0000

    Change .pc file
    
    As we are breaking API compatibility

 Makefile.am                        |    5 ++---
 configure.ac                       |    2 +-
 examples/Makefile.am               |    2 +-
 gtkgl-2.0.pc.in => gtkgl-3.0.pc.in |    6 +++---
 gtkgl/Makefile.am                  |   24 ++++++++++++------------
 5 files changed, 19 insertions(+), 20 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 918fe37..7654627 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,8 +7,7 @@ ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS}
 SUBDIRS= gtkgl examples docs # build
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = gtkgl-2.0.pc
+pkgconfig_DATA = gtkgl-3.0.pc
 
 EXTRA_DIST = \
-  gtkgl-2.0.pc.in
-
+  gtkgl-3.0.pc.in
diff --git a/configure.ac b/configure.ac
index 7a0447d..ddda71f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -180,7 +180,7 @@ AC_SUBST(GL_LIBS)
 
 AC_CONFIG_FILES([
   Makefile
-  gtkgl-2.0.pc
+  gtkgl-3.0.pc
   gtkgl/Makefile
   gtkgl/makefile.mingw
   docs/Makefile
diff --git a/examples/Makefile.am b/examples/Makefile.am
index e66064c..b56975e 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -10,7 +10,7 @@ noinst_PROGRAMS = simple zktor viewlw $(shader_programs) gtkglarea_demo
 
 AM_CPPFLAGS = -I$(top_srcdir)
 AM_CFLAGS = $(GTK_CFLAGS) $(GL_CFLAGS)
-LDADD = $(top_builddir)/gtkgl/libgtkgl-2.0.la $(GTK_LIBS) $(GL_LIBS) $(LIBM)
+LDADD = $(top_builddir)/gtkgl/libgtkgl-3.0.la $(GTK_LIBS) $(GL_LIBS) $(LIBM)
 
 simple_SOURCES   = simple.c
 zktor_SOURCES    = zktor.c
diff --git a/gtkgl-2.0.pc.in b/gtkgl-3.0.pc.in
similarity index 59%
rename from gtkgl-2.0.pc.in
rename to gtkgl-3.0.pc.in
index ce2ee73..676880d 100644
--- a/gtkgl-2.0.pc.in
+++ b/gtkgl-3.0.pc.in
@@ -6,6 +6,6 @@ includedir= includedir@
 Name: GtkGLArea
 Description: an OpenGL widget for GTK+
 Version: @VERSION@
-Requires: gtk+-2.0
-Libs: -L${libdir} -lgtkgl-2.0 @GL_LIBS@
-Cflags: -I${includedir}/gtkgl-2.0 @GL_CFLAGS@
+Requires: gtk+-3.0
+Libs: -L${libdir} -lgtkgl-3.0 @GL_LIBS@
+Cflags: -I${includedir}/gtkgl-3.0 @GL_CFLAGS@
diff --git a/gtkgl/Makefile.am b/gtkgl/Makefile.am
index a8c5011..d75093f 100644
--- a/gtkgl/Makefile.am
+++ b/gtkgl/Makefile.am
@@ -4,22 +4,22 @@ if OS_WIN32
 export_symbols = -export-symbols gtkgl.def
 
 install-libtool-import-lib:
-       $(INSTALL) .libs/libgtkgl-2.0.dll.a $(DESTDIR)$(libdir)
+       $(INSTALL) .libs/libgtkgl-3.0.dll.a $(DESTDIR)$(libdir)
 uninstall-libtool-import-lib:
-       -rm $(DESTDIR)$(libdir)/libgtkgl-2.0.dll.a
+       -rm $(DESTDIR)$(libdir)/libgtkgl-3.0.dll.a
 else
 install-libtool-import-lib:
 uninstall-libtool-import-lib:
 endif
 
 if MS_LIB_AVAILABLE
-noinst_DATA = gtkgl-2.0.lib
+noinst_DATA = gtkgl-3.0.lib
 
 install-ms-lib:
-       $(INSTALL) gtkgl-2.0.lib $(DESTDIR)$(libdir)
+       $(INSTALL) gtkgl-3.0.lib $(DESTDIR)$(libdir)
 
 uninstall-ms-lib:
-       -rm $(DESTDIR)$(libdir)/gtkgl-2.0.lib
+       -rm $(DESTDIR)$(libdir)/gtkgl-3.0.lib
 else
 install-ms-lib:
 uninstall-ms-lib:
@@ -30,17 +30,17 @@ EXTRA_DIST = makefile.mingw makefile.mingw.in gtkgl.def
 AM_CPPFLAGS = -I$(top_srcdir)
 AM_CFLAGS = $(GTK_CFLAGS) $(GL_CFLAGS)
 
-gtkglincludedir = $(includedir)/gtkgl-2.0/gtkgl
+gtkglincludedir = $(includedir)/gtkgl-3.0/gtkgl
 
-lib_LTLIBRARIES= libgtkgl-2.0.la
+lib_LTLIBRARIES= libgtkgl-3.0.la
 
 gtkglinclude_HEADERS= gdkgl.h gtkglarea.h
-libgtkgl_2_0_la_SOURCES = gdkgl.c gtkglarea.c
-libgtkgl_2_0_la_LDFLAGS = -version-info $(GTKGL_LIBRARY_VERSION) $(export_symbols) -no-undefined
-libgtkgl_2_0_la_LIBADD = $(GTK_LIBS) $(GL_LIBS)
+libgtkgl_3_0_la_SOURCES = gdkgl.c gtkglarea.c
+libgtkgl_3_0_la_LDFLAGS = -version-info $(GTKGL_LIBRARY_VERSION) $(export_symbols) -no-undefined
+libgtkgl_3_0_la_LIBADD = $(GTK_LIBS) $(GL_LIBS)
 
-gtkgl-2.0.lib: libgtkgl-2.0.la gtkgl.def
-       lib -name:libgtkgl-2 0- LT_CURRENT_MINUS_AGE@.dll -def:gtkgl.def -out:$@
+gtkgl-3.0.lib: libgtkgl-3.0.la gtkgl.def
+       lib -name:libgtkgl-3 0- LT_CURRENT_MINUS_AGE@.dll -def:gtkgl.def -out:$@
 
 install-data-local: install-ms-lib install-libtool-import-lib
 


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