From bbc22b9870ba2a9e28452f78a0ec8d91a24b749e Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Sun, 7 Sep 2003 23:33:11 +0000 Subject: [PATCH] remove obconf from this tree. add versioning for the libraries and pkgconfig files for them. --- Makefile.am | 39 +++++++++---------------- configure.ac | 73 ++++++++++++++++++++++++++++------------------- parser/.cvsignore | 2 ++ parser/obparser-3.0.pc.in | 11 +++++++ render/.cvsignore | 1 + render/obrender-3.0.pc.in | 11 +++++++ 6 files changed, 81 insertions(+), 56 deletions(-) create mode 100644 parser/obparser-3.0.pc.in create mode 100644 render/obrender-3.0.pc.in diff --git a/Makefile.am b/Makefile.am index 206f4d6..7d1ec7e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,7 +4,8 @@ themedir = $(datadir)/openbox/themes localedir = $(datadir)/locale rcdir = $(datadir)/openbox desktopfilesdir = $(datadir)/gnome/wm-properties -pixmapdir = $(datadir)/pixmaps +pkgconfigdir = $(libdir)/pkgconfig +pubincludedir = $(includedir)/openbox/@OB_VERSION@/openbox theme = thebear @@ -24,11 +25,6 @@ bin_PROGRAMS = \ openbox/openbox \ tools/kdetrayproxy/kdetrayproxy -if OBCONF -bin_PROGRAMS += \ - tools/obconf/obconf -endif - ## render ## render_rendertest_CPPFLAGS = \ @@ -183,26 +179,6 @@ openbox_openbox_SOURCES = \ openbox/xerror.c \ openbox/xerror.h -## obconf ## - -tools_obconf_obconf_CPPFLAGS = \ - $(GTK_CFLAGS) \ - $(GDK_PIXBUF_CFLAGS) \ - $(XML_CFLAGS) \ - -DLOCALEDIR=\"$(localedir)\" \ - -DRCDIR=\"$(rcdir)\" \ - -DPIXMAPDIR=\"$(pixmapdir)\" \ - -DG_LOG_DOMAIN=\"Obconf\" -tools_obconf_obconf_LDADD = \ - $(GTK_LIBS) \ - $(GDK_PIXBUF_LIBS) \ - $(LIBINTL) \ - render/libobrender.la \ - parser/libobparser.la -tools_obconf_obconf_SOURCES = \ - gettext.h \ - tools/obconf/main.c - ## kdetrayproxy ## @@ -255,6 +231,17 @@ dist_thebear_theme_DATA = \ themes/thebear/themerc +## public headers ## + +pubinclude_HEADERS = \ + render/render.h \ + render/theme.h \ + parser/parse.h + +nodist_pkgconfig_DATA = \ + render/obrender-3.0.pc \ + parser/obparser-3.0.pc + ## data ## dist_rc_DATA = \ diff --git a/configure.ac b/configure.ac index a485a43..f9b64a6 100644 --- a/configure.ac +++ b/configure.ac @@ -3,12 +3,49 @@ AC_INIT([openbox], [3.0-beta1], [http://bugzilla.icculus.org]) 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 if backwards compatibility has been broken, +dnl set OB_BINARY_AGE and OB_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=0 +OB_MICRO_VERSION=0 +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) + +dnl Libtool versioning +LT_RELEASE=$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) + AC_PREFIX_DEFAULT([/usr/local]) test "$prefix" = "NONE" && prefix=$ac_default_prefix -# Determine build target +dnl Determine build target OB_DEBUG -# Pick compiler specific/build target flags, and set $CVS +dnl Pick compiler specific/build target flags, and set $CVS AM_PROG_CC_C_O OB_COMPILER_FLAGS AC_C_CONST @@ -54,40 +91,14 @@ PKG_CHECK_MODULES(LIBSN, [libstartup-notification-1.0], ] ) -PKG_CHECK_MODULES(GTK, [gtk+-2.0], - [ - AC_SUBST(GTK_CFLAGS) - AC_SUBST(GTK_LIBS) - use_gtk="yes" - - PKG_CHECK_MODULES(GDK_PIXBUF, [gdk-pixbuf-2.0], - [ - AC_SUBST(GDK_PIXBUF_CFLAGS) - AC_SUBST(GDK_PIXBUF_LIBS) - use_gdk_pixbuf="yes" - ], - [ - use_gdk_pixbuf="no" - AC_MSG_WARN([disabling build of the configuration tool]) - ] - ) - ], - [ - use_gtk="no" - AC_MSG_WARN([disabling build of the configuration tool]) - ] -) -AM_CONDITIONAL(OBCONF, - [test "$use_gtk" = "yes" && test "$use_gdk_pixbuf" = "yes"]) - -# Check for session management +dnl Check for session management X11_SM #EFENCE_LIBS=-lefence EFENCE_LIBS="" AC_SUBST(EFENCE_LIBS) -# Check for X11 extensions +dnl Check for X11 extensions X11_EXT_XKB X11_EXT_XRANDR X11_EXT_VIDMODE @@ -98,6 +109,8 @@ AC_CONFIG_FILES([ Makefile m4/Makefile po/Makefile.in + render/obrender-3.0.pc + parser/obparser-3.0.pc ]) AC_OUTPUT diff --git a/parser/.cvsignore b/parser/.cvsignore index 8951724..72fa54d 100644 --- a/parser/.cvsignore +++ b/parser/.cvsignore @@ -2,4 +2,6 @@ .libs libobparser.la .dirstamp +parser_libobparser_la-parse.l +obparser-3.0.pc parser_libobparser_la-parse.lo diff --git a/parser/obparser-3.0.pc.in b/parser/obparser-3.0.pc.in new file mode 100644 index 0000000..88d99f1 --- /dev/null +++ b/parser/obparser-3.0.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: ObParser +Description: Openbox config file parsing library +Version: @VERSION@ +Requires: libxml-2.0 +Libs: -L${libdir} -lobparser +Cflags: -I${includedir}/openbox/@OB_VERSION@ diff --git a/render/.cvsignore b/render/.cvsignore index 12e915b..e14eb73 100644 --- a/render/.cvsignore +++ b/render/.cvsignore @@ -12,3 +12,4 @@ render_libobrender_la-theme.lo .deps render_libobrender_la-instance.lo .dirstamp +obrender-3.0.pc diff --git a/render/obrender-3.0.pc.in b/render/obrender-3.0.pc.in new file mode 100644 index 0000000..11a9177 --- /dev/null +++ b/render/obrender-3.0.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: ObRender +Description: Openbox Render Library +Version: @VERSION@ +Requires: +Libs: -L${libdir} -lobrender +Cflags: -I${includedir}/openbox/@OB_VERSION@ -- 1.9.1