diff options
| -rw-r--r-- | Makefile.am | 14 | ||||
| -rw-r--r-- | configure.ac | 86 | ||||
| -rw-r--r-- | obt/obt-4.0.pc | 4 | ||||
| -rw-r--r-- | obt/obt-4.0.pc.in | 2 | ||||
| -rw-r--r-- | parser/obparser-4.0.pc.in (renamed from parser/obparser-3.0.pc.in) | 0 | ||||
| -rw-r--r-- | render/obrender-4.0.pc.in (renamed from render/obrender-3.0.pc.in) | 2 |
6 files changed, 66 insertions, 42 deletions
diff --git a/Makefile.am b/Makefile.am index 389042fb..9e8316f8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -63,7 +63,7 @@ render_libobrender_la_CPPFLAGS = \ -DG_LOG_DOMAIN=\"ObRender\" \ -DDEFAULT_THEME=\"$(theme)\" render_libobrender_la_LDFLAGS = \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) + -version-info $(RR_CURRENT):$(RR_REVISION):$(RR_AGE) render_libobrender_la_LIBADD = \ parser/libobparser.la \ $(X_LIBS) \ @@ -102,7 +102,7 @@ parser_libobparser_la_CPPFLAGS = \ -DDATADIR=\"$(datadir)\" \ -DCONFIGDIR=\"$(configdir)\" parser_libobparser_la_LDFLAGS = \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) + -version-info $(RR_CURRENT):$(RR_REVISION):$(RR_AGE) parser_libobparser_la_LIBADD = \ $(GLIB_LIBS) \ $(XML_LIBS) @@ -124,7 +124,7 @@ obt_libobt_la_CPPFLAGS = \ -DDATADIR=\"$(datadir)\" \ -DCONFIGDIR=\"$(configdir)\" obt_libobt_la_LDFLAGS = \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) + -version-info $(OBT_CURRENT):$(OBT_REVISION):$(OBT_AGE) obt_libobt_la_LIBADD = \ $(XINERAMA_LIBS) \ $(XKB_LIBS) \ @@ -402,8 +402,8 @@ nodist_pubinclude_HEADERS = \ version.h nodist_pkgconfig_DATA = \ - render/obrender-3.0.pc \ - parser/obparser-3.0.pc \ + render/obrender-4.0.pc \ + parser/obparser-4.0.pc \ obt/obt-4.0.pc ## data ## @@ -463,8 +463,8 @@ dist_noinst_DATA = \ doc/openbox-gnome-session.1.in \ doc/openbox-kde-session.1.sgml \ doc/openbox-kde-session.1.in \ - render/obrender-3.0.pc.in \ - parser/obparser-3.0.pc.in \ + render/obrender-4.0.pc.in \ + parser/obparser-4.0.pc.in \ obt/obt-4.0.pc.in \ tools/themeupdate/themeupdate.py \ tests/hideshow.py \ diff --git a/configure.ac b/configure.ac index eef3d554..bfcff7a1 100644 --- a/configure.ac +++ b/configure.ac @@ -4,41 +4,65 @@ AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([openbox/openbox.c]) dnl Making releases: -dnl OB_MICRO_VERSION += 1; -dnl OB_INTERFACE_AGE += 1; -dnl OB_BINARY_AGE += 1; -dnl if any functions have been added, set OB_INTERFACE_AGE to 0. +dnl RR_MICRO_VERSION += 1; +dnl RR_INTERFACE_AGE += 1; +dnl R_BINARY_AGE += 1; +dnl if any functions have been added, set RR_INTERFACE_AGE to 0. dnl if backwards compatibility has been broken, -dnl set OB_BINARY_AGE and OB_INTERFACE_AGE to 0. +dnl set RR_BINARY_AGE and RR_INTERFACE_AGE to 0. dnl dnl if MAJOR or MINOR version changes, be sure to change AC_INIT above to match dnl -OB_MAJOR_VERSION=3 -OB_MINOR_VERSION=4 -OB_MICRO_VERSION=16 -OB_INTERFACE_AGE=0 -OB_BINARY_AGE=0 -OB_VERSION=$OB_MAJOR_VERSION.$OB_MINOR_VERSION - -AC_SUBST(OB_MAJOR_VERSION) -AC_SUBST(OB_MINOR_VERSION) -AC_SUBST(OB_MICRO_VERSION) -AC_SUBST(OB_INTERFACE_AGE) -AC_SUBST(OB_BINARY_AGE) -AC_SUBST(OB_VERSION) +RR_MAJOR_VERSION=4 +RR_MINOR_VERSION=0 +RR_MICRO_VERSION=16 +RR_INTERFACE_AGE=0 +RR_BINARY_AGE=0 +RR_VERSION=$OB_MAJOR_VERSION.$OB_MINOR_VERSION + +OBT_MAJOR_VERSION=4 +OBT_MINOR_VERSION=0 +OBT_MICRO_VERSION=0 +OBT_INTERFACE_AGE=0 +OBT_BINARY_AGE=0 +OBT_VERSION=$OB_MAJOR_VERSION.$OB_MINOR_VERSION + +AC_SUBST(RR_MAJOR_VERSION) +AC_SUBST(RR_MINOR_VERSION) +AC_SUBST(RR_MICRO_VERSION) +AC_SUBST(RR_INTERFACE_AGE) +AC_SUBST(RR_BINARY_AGE) +AC_SUBST(RR_VERSION) +AC_SUBST(OBT_MAJOR_VERSION) +AC_SUBST(OBT_MINOR_VERSION) +AC_SUBST(OBT_MICRO_VERSION) +AC_SUBST(OBT_INTERFACE_AGE) +AC_SUBST(OBT_BINARY_AGE) +AC_SUBST(OBT_VERSION) dnl Libtool versioning -LT_RELEASE=$OB_MAJOR_VERSION.$OB_MINOR_VERSION -LT_CURRENT=`expr $OB_MICRO_VERSION - $OB_INTERFACE_AGE` -LT_REVISION=$OB_INTERFACE_AGE -LT_AGE=`expr $OB_BINARY_AGE - $OB_INTERFACE_AGE` -LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE` - -AC_SUBST(LT_RELEASE) -AC_SUBST(LT_CURRENT) -AC_SUBST(LT_REVISION) -AC_SUBST(LT_AGE) -AC_SUBST(LT_CURRENT_MINUS_AGE) +RR_RELEASE=$RR_MAJOR_VERSION.$RR_MINOR_VERSION +RR_CURRENT=`expr $RR_MICRO_VERSION - $RR_INTERFACE_AGE` +RR_REVISION=$RR_INTERFACE_AGE +RR_AGE=`expr $RR_BINARY_AGE - $RR_INTERFACE_AGE` +RR_CURRENT_MINUS_AGE=`expr $RR_CURRENT - $RR_AGE` + +OBT_RELEASE=$OBT_MAJOR_VERSION.$OBT_MINOR_VERSION +OBT_CURRENT=`expr $OBT_MICRO_VERSION - $OBT_INTERFACE_AGE` +OBT_REVISION=$OBT_INTERFACE_AGE +OBT_AGE=`expr $OBT_BINARY_AGE - $OBT_INTERFACE_AGE` +OBT_CURRENT_MINUS_AGE=`expr $OBT_CURRENT - $OBT_AGE` + +AC_SUBST(RR_RELEASE) +AC_SUBST(RR_CURRENT) +AC_SUBST(RR_REVISION) +AC_SUBST(RR_AGE) +AC_SUBST(RR_CURRENT_MINUS_AGE) +AC_SUBST(OBT_RELEASE) +AC_SUBST(OBT_CURRENT) +AC_SUBST(OBT_REVISION) +AC_SUBST(OBT_AGE) +AC_SUBST(OBT_CURRENT_MINUS_AGE) AC_PREFIX_DEFAULT([/usr/local]) test "$prefix" = "NONE" && prefix=$ac_default_prefix @@ -154,8 +178,8 @@ AC_CONFIG_FILES([ Makefile m4/Makefile po/Makefile.in - render/obrender-3.0.pc - parser/obparser-3.0.pc + render/obrender-4.0.pc + parser/obparser-4.0.pc obt/obt-4.0.pc version.h ]) diff --git a/obt/obt-4.0.pc b/obt/obt-4.0.pc index 34aad6dc..c7a2fc0b 100644 --- a/obt/obt-4.0.pc +++ b/obt/obt-4.0.pc @@ -6,9 +6,9 @@ includedir=${prefix}/include xcflags= xlibs= -lSM -lICE -lX11 -Name: ObRender +Name: Obt Description: Openbox Toolkit Library Version: 3.999.0 Requires: glib-2.0 Libs: -L${libdir} -lobrender ${xlibs} -Cflags: -I${includedir}/openbox/3.4 ${xcflags} +Cflags: -I${includedir}/openbox/@OB_VERSION@ ${xcflags} diff --git a/obt/obt-4.0.pc.in b/obt/obt-4.0.pc.in index 1d2b6685..ee2a3f0a 100644 --- a/obt/obt-4.0.pc.in +++ b/obt/obt-4.0.pc.in @@ -6,7 +6,7 @@ includedir=@includedir@ xcflags=@X_CFLAGS@ xlibs=@X_LIBS@ -Name: ObRender +Name: Obt Description: Openbox Toolkit Library Version: @VERSION@ Requires: glib-2.0 diff --git a/parser/obparser-3.0.pc.in b/parser/obparser-4.0.pc.in index 75d04c99..75d04c99 100644 --- a/parser/obparser-3.0.pc.in +++ b/parser/obparser-4.0.pc.in diff --git a/render/obrender-3.0.pc.in b/render/obrender-4.0.pc.in index ebb17ef3..9c310569 100644 --- a/render/obrender-3.0.pc.in +++ b/render/obrender-4.0.pc.in @@ -9,6 +9,6 @@ xlibs=@X_LIBS@ Name: ObRender Description: Openbox Render Library Version: @VERSION@ -Requires: obparser-3.0 glib-2.0 xft pangoxft +Requires: obparser-4.0 glib-2.0 xft pangoxft Libs: -L${libdir} -lobrender ${xlibs} Cflags: -I${includedir}/openbox/@OB_VERSION@ ${xcflags} |