GNOME.org
 

gtk-css-engine r64 - in branches/bzr: . libccd/ccd libccd/examples src

Author: robsta
Date: Fri Sep  5 11:33:34 2008
New Revision: 64
URL: http://svn.gnome.org/viewvc/gtk-css-engine?rev=64&view=rev

Log:
Standalone libccd build infrastructure.

Modified:
   branches/bzr/   (props changed)
   branches/bzr/configure.in
   branches/bzr/libccd/ccd/Makefile.am
   branches/bzr/libccd/examples/Makefile.am
   branches/bzr/src/Makefile.am

Modified: branches/bzr/configure.in
==============================================================================
--- branches/bzr/configure.in	(original)
+++ branches/bzr/configure.in	Fri Sep  5 11:33:34 2008
@@ -1,40 +1,100 @@
 
-AC_PREREQ(2.61)
-AC_INIT([gtk-css-engine], [0.1])
-AC_CONFIG_SRCDIR([config.h.in])
+# This script follows 
+# http://www.gnu.org/software/autoconf/manual/html_node/Autoconf-Input-Layout.html#Autoconf-Input-Layout
+# Please keep it like that.
+
+# Guessing some version.
+AC_PREREQ(2.54)
+
+# Making releases:
+#   CCD_MICRO_VERSION += 1;
+#   CCD_INTERFACE_AGE += 1;
+#   CCD_BINARY_AGE += 1;
+# if any functions have been added, set CCD_INTERFACE_AGE to 0.
+# if backwards compatibility has been broken,
+# set CCD_BINARY_AGE and CCD_INTERFACE_AGE to 0.
+
+m4_define([ccd_version_major], [0])
+m4_define([ccd_version_minor], [0])
+m4_define([ccd_version_micro], [9])
+m4_define([ccd_version_extra], [trunk])
+m4_define([ccd_interface_age], [0])
+
+m4_define([ccd_binary_age],
+  [m4_eval(100 * ccd_minor_version + ccd_micro_version)])
+
+m4_define([ccd_version],
+  [ccd_version_major.ccd_version_minor.ccd_version_micro[]ccd_version_extra])
+
+AC_INIT([gtk-css-engine], [ccd_version])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_HEADERS([libccd/ccd/ccd-features.h])
+AC_CONFIG_SRCDIR([libccd/ccd/ccd-stylesheet.c])
 
 AM_INIT_AUTOMAKE
 AM_MAINTAINER_MODE
 
-### Checks for configure arguments
+# TODO
+#m4_define([lt_current], [m4_eval(100 * ccd_minor_version + ccd_micro_version - ccd_interface_age)])
+#m4_define([lt_revision], [ccd_interface_age])
+#m4_define([lt_age], [m4_eval(ccd_binary_age - ccd_interface_age)])
+#LT_VERSION_INFO="lt_current:lt_revision:lt_age"
+#AC_SUBST(LT_VERSION_INFO)
+LT_VERSION_INFO="0:0:0"
+AC_SUBST(LT_VERSION_INFO)
+
+### Checks for configure arguments. ############################################
+
+AC_ARG_ENABLE([libccd], 
+  [AS_HELP_STRING([--enable-libccd], [build standalone libccd])], 
+[
+  case "$enableval" in
+  yes ) ;;
+  no  ) ;;
+  * ) enable_libccd="yes" ;;
+  esac
+], [
+  enable_libccd="no"
+])
+
+if test "$enable_libccd" == "yes"; then
+  AC_DEFINE([CCD_STANDALONE], [1], [build standalone libccd])
+fi
+AM_CONDITIONAL([CCD_STANDALONE], test "$enable_libccd" == "yes")
+
 
 AC_ARG_ENABLE([debug], 
-	[AS_HELP_STRING([--enable-debug], [enable debug code])], 
+  [AS_HELP_STRING([--enable-debug], [enable debug code])], 
 [
-	if test "$enableval" == "yes"; then
-		AC_DEFINE([CCD_DEBUG], [1], [Enable debug code])
-	fi
+  if test "$enableval" == "yes"; then
+    AC_DEFINE([CCD_DEBUG], [1], [enable debug code])
+  fi
 ])
 
+# So usually one just sets CFLAGS for this, but a configure 
+# arguments lets us force this when running `make distcheck'.
 AC_ARG_ENABLE([werror], 
-	[AS_HELP_STRING([--enable-werror], [bail on warnings])], 
+  [AS_HELP_STRING([--enable-werror], [bail on warnings])], 
 [
-	if test "$enableval" == "yes"; then
-		CFLAGS="$CFLAGS -Werror"
-	fi	
+  if test "$enableval" == "yes"; then
+    CFLAGS="$CFLAGS -Werror"
+  fi  
 ])
 
-### Checks for programs.
+### Checks for programs. #######################################################
+
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_INSTALL
-AC_DISABLE_STATIC
-AC_PROG_LIBTOOL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 
+# Should be replaced by LT_INIT, which apparently doesn't work.
+# Try again some time.
+AC_DISABLE_STATIC
+AC_LIBTOOL_WIN32_DLL
+AC_PROG_LIBTOOL 
+
 # gtk-doc
 gtk_doc_installed=true
 #ifdef([GTK_DOC_CHECK],[GTK_DOC_CHECK([1.0])],[gtk_doc_installed=false])
@@ -43,19 +103,18 @@
 GTK_DOC_CHECK([1.0])
 AM_CONDITIONAL(GTK_DOC_INSTALLED, $gtk_doc_installed)
 
-
-### Checks for libraries.
+### Checks for libraries. ######################################################
 
 # Maybe it would work with gtk+-2.8, the first sporting cairo, right?
 pkgs='gtk+-2.0 >= 2.10.0 libcroco-0.6'
 
 # Guessing a version.
 rsvg_req='librsvg-2.0 >= 2.16'
-gce_cv_rsvg="no"
+ccd_cv_rsvg="no"
 PKG_CHECK_EXISTS([ $rsvg_req ],
 [
-	gce_cv_rsvg="yes"
-	pkgs="$pkgs $rsvg_req"
+  ccd_cv_rsvg="yes"
+  pkgs="$pkgs $rsvg_req"
 ])
 
 PKG_CHECK_MODULES(GCE, $pkgs)
@@ -66,64 +125,62 @@
 AC_DEFINE([CCD_WITH_GTK], [1], [Support for drawing Gtk+ primitives like `box-gap'])
 AM_CONDITIONAL([CCD_WITH_GTK], [test "yes" = "yes"])
 
-if test "$gce_cv_rsvg" = "yes"; then
-	AC_DEFINE([CCD_WITH_RSVG], [1], [SVG support through the `rsvg' library])
+if test "$ccd_cv_rsvg" = "yes"; then
+  AC_DEFINE([CCD_WITH_RSVG], [1], [SVG support through the `rsvg' library])
 fi
-AM_CONDITIONAL([CCD_WITH_RSVG], [test "$gce_cv_rsvg" = "yes"])
+AM_CONDITIONAL([CCD_WITH_RSVG], [test "$ccd_cv_rsvg" = "yes"])
 
 AC_SUBST([CCD_CFLAGS], [$GCE_CFLAGS])
 AC_SUBST([CCD_LIBS], [$GCE_LIBS])
 
-### Checks for header files.
+### Checks for header files. ###################################################
+
 AC_HEADER_STDC
 AC_CHECK_HEADERS([stdbool.h stdint.h stdio.h stdlib.h string.h])
 
-### Checks for typedefs, structures, and compiler characteristics.
+### Checks for typedefs, structures, and compiler characteristics. #############
+
 AC_C_CONST
 
-set_more_warnings=yes
-if test "$GCC" = "yes" -a "$CC" != 'g++' -a "x$set_more_warnings" != "xno"; then
-	for option in -std=c99 -pedantic -Wall -Wbitwise -Wcast-to-as 		\
-		      -Wchar-subscripts -Wdeclaration-after-statement 		\
-		      -Wdefault-bitfield-sign -Wdo-while -Wmissing-declarations	\
-		      -Wmissing-noreturn -Wmissing-prototypes -Wnested-externs	\
-		      -Wnested-externs -Wno-pointer-sign -Wparen-string		\
-		      -Wpointer-arith -Wptr-subtraction-blows -Wreturn-void	\
-		      -Wsign-compare -Wstrict-prototypes -Wtypesign		\
-		      -Wwrite-strings ; do
-		SAVE_CFLAGS="$CFLAGS"
-		CFLAGS="$CFLAGS $option"
-		AC_MSG_CHECKING([whether gcc understands $option])
-		AC_TRY_COMPILE([], [],
-			has_option=yes,
-			has_option=no,)
-		if test $has_option = no; then
-		  CFLAGS="$SAVE_CFLAGS"
-		fi
-		AC_MSG_RESULT($has_option)
-		unset has_option
-		unset SAVE_CFLAGS
-	done
-	unset option
+if test "$GCC" = "yes"; then
+  for option in -std=c99 -pedantic -Wall -Wbitwise -Wcast-to-as			\
+    -Wchar-subscripts -Wdeclaration-after-statement -Wdefault-bitfield-sign	\
+    -Wdo-while -Wmissing-declarations -Wmissing-noreturn -Wmissing-prototypes	\
+    -Wnested-externs -Wno-pointer-sign -Wparen-string -Wpointer-arith		\
+    -Wptr-subtraction-blows -Wreturn-void -Wsign-compare -Wstrict-prototypes	\
+    -Wtypesign -Wwrite-strings ; do
+    SAVE_CFLAGS="$CFLAGS"
+    CFLAGS="$CFLAGS $option"
+    AC_MSG_CHECKING([whether gcc understands $option])
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[has_option=yes],[has_option=no])
+    if test $has_option = no; then
+      CFLAGS="$SAVE_CFLAGS"
+    fi
+    AC_MSG_RESULT($has_option)
+    unset has_option
+    unset SAVE_CFLAGS
+  done
+  unset option
 fi
 
 AC_CONFIG_FILES([
-	Makefile
-	libccd/Makefile
-	libccd/ccd/Makefile
-	libccd/doc/Makefile
-	libccd/doc/version.xml
-	libccd/examples/Makefile
-	src/Makefile
-	themes/Makefile
-	themes/Gilouche-CSS/Makefile
-	themes/Gilouche-CSS/gtk-2.0/Makefile
-	themes/gtk-css-test/Makefile
-	themes/gtk-css-test/gtk-2.0/Makefile])
+  Makefile
+  libccd/Makefile
+  libccd/ccd/Makefile
+  libccd/doc/Makefile
+  libccd/doc/version.xml
+  libccd/examples/Makefile
+  src/Makefile
+  themes/Makefile
+  themes/Gilouche-CSS/Makefile
+  themes/Gilouche-CSS/gtk-2.0/Makefile
+  themes/gtk-css-test/Makefile
+  themes/gtk-css-test/gtk-2.0/Makefile])
 AC_OUTPUT
 
 echo "
 Configuration
-
-    Support for SVG images	$gce_cv_rsvg
+    Standalone libccd       $enable_libccd
+    Support for SVG images  $ccd_cv_rsvg
 "
+

Modified: branches/bzr/libccd/ccd/Makefile.am
==============================================================================
--- branches/bzr/libccd/ccd/Makefile.am	(original)
+++ branches/bzr/libccd/ccd/Makefile.am	Fri Sep  5 11:33:34 2008
@@ -4,9 +4,21 @@
 	-I$(top_srcdir)/libccd \
 	-I$(top_builddir)/libccd
 
-noinst_LTLIBRARIES = libccd.la
+if CCD_STANDALONE
+lib_LTLIBRARIES = libccd-1.la
+libccd_1_la_LDFLAGS = -no-undefined -version-info $(LT_VERSION_INFO)
+headersdir = $(includedir)/libccd-1/ccd
+headers_DATA = \
+	ccd.h \
+	ccd-node.h \
+	ccd-selector-group.h \
+	ccd-style.h \
+	ccd-stylesheet.h
+else
+noinst_LTLIBRARIES = libccd-1.la
+endif
 
-libccd_la_SOURCES = \
+libccd_1_la_SOURCES = \
 	ccd-background.c \
 	ccd-background.h \
 	ccd-block.c \
@@ -39,7 +51,7 @@
 	ccd-stylesheet.h
 
 if CCD_WITH_GTK
-libccd_la_SOURCES += \
+libccd_1_la_SOURCES += \
 	ccd-gtk-style.c \
 	ccd-gtk-style.h
 endif

Modified: branches/bzr/libccd/examples/Makefile.am
==============================================================================
--- branches/bzr/libccd/examples/Makefile.am	(original)
+++ branches/bzr/libccd/examples/Makefile.am	Fri Sep  5 11:33:34 2008
@@ -6,7 +6,7 @@
 
 AM_LDFLAGS = \
 	$(CCD_LIBS) \
-	../ccd/libccd.la
+	../ccd/libccd-1.la
 
 noinst_PROGRAMS = example1 internal
 

Modified: branches/bzr/src/Makefile.am
==============================================================================
--- branches/bzr/src/Makefile.am	(original)
+++ branches/bzr/src/Makefile.am	Fri Sep  5 11:33:34 2008
@@ -12,7 +12,7 @@
 
 libcss_la_LIBADD = \
 	$(GCE_LIBS) \
-	./../libccd/ccd/libccd.la
+	./../libccd/ccd/libccd-1.la
 
 libcss_la_SOURCES = \
 	gce-functions.c \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]