big cleanup here. make sure seleng, layeng and tests are disabled by

2003-12-11  Dodji Seketeli <dodji@gnome.org>

* Makefile.am: big cleanup here.
* configure.in: make sure seleng, layeng and tests are
disabled by default. Added makefiles in docs/ docs/example
tests/ tests/test-inputs tests/test-output-refs
* csslint/Makefile.am: cleaned this up. make sure to add
seleng,layeng and glib compile flags whenever needed.
* docs/Makefile.am,docs/examples/Makefile.am: new makefiles.
* src/libcroco.h: removed references to cr-parser-input.h
* src/layeng/Makefile.am: cleanup, make distcheck is happier.
* src/parser/Makefile.am: cleanup, make distcheck is happier.
* src/parser/cr-doc-handler.h: removed reference to cr-parser-input.h
* src/parser/cr-layout-eng.h,src/parser/cr-parser-input.h: removed these.
* src/parser/cr-parser.c:
(cr_parser_new): fixed a typo here.
* src/parser/cr-parser.h,src/parser/cr-tknzr.h:
removed ref to cr-parser-input.h
* src/seleng/Makefile.am: cleanup, make distcheck is happier.
* tests/testctl: exclude makefiles when diffing outputs and re
* outputs.

22 files changed, 117 insertions, 234 deletions

diff --git a/ChangeLog b/ChangeLog
index 07bb9ca..e2fd4f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,24 @@
 	(cr_style_to_pango_font_attributes): removed this function
 	from here and put it in src/layeng/cr-lay-eng.[ch]. This way,
 	we seleng doesn't depend on pango. Only layout engine does.
+	* Makefile.am: big cleanup here.
+	* configure.in: make sure seleng, layeng and tests are 
+	disabled by default. Added makefiles in docs/ docs/example
+	tests/ tests/test-inputs tests/test-output-refs
+	* csslint/Makefile.am: cleaned this up. make sure to add
+	seleng,layeng and glib compile flags whenever needed.
+	* docs/Makefile.am,docs/examples/Makefile.am: new makefiles.
+	* src/libcroco.h: removed references to cr-parser-input.h
+	* src/layeng/Makefile.am: cleanup, make distcheck is happier.
+	* src/parser/Makefile.am: cleanup, make distcheck is happier.
+	* src/parser/cr-doc-handler.h: removed reference to cr-parser-input.h
+	* src/parser/cr-layout-eng.h,src/parser/cr-parser-input.h: removed these.
+	* src/parser/cr-parser.c: 
+	(cr_parser_new): fixed a typo here.
+	* src/parser/cr-parser.h,src/parser/cr-tknzr.h: 
+	removed ref to cr-parser-input.h
+	* src/seleng/Makefile.am: cleanup, make distcheck is happier.
+	* tests/testctl: exclude makefiles when diffing outputs and re outputs.
 
 2003-08-17  Gaël CHAMOULAUD <strider@gnome.org>
 
diff --git a/Makefile.am b/Makefile.am
index deb60ff..37da322 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = src csslint
+SUBDIRS = src csslint docs
 SUBDIRS += tests
 
 pkgconfigdir=$(libdir)/pkgconfig
@@ -11,9 +11,7 @@ bin_SCRIPTS=croco-config
 man_MANS = croco-config.1
 
 EXTRA_DIST= croco-config.in libcroco.pc libcroco.spec TODO Doxyfile \
-HACKING COPYING.LIB COPYING docs/examples/*.c libcroco.spec  \
-docs/usage.txt  tests/test-inputs/*.css tests/testctl \
-tests/test-output-refs/*.out $(man_MANS)
+HACKING COPYING.LIB COPYING  libcroco.spec tests/testctl $(man_MANS)
 
 cleantar:
 	@(rm -f libcroco*.tar.gz)
diff --git a/configure.in b/configure.in
index 426c550..7c12762 100644
--- a/configure.in
+++ b/configure.in
@@ -148,7 +148,7 @@ dnl this option enables compilation of the selection engine
 CROCO_SELENG_ENABLED=0
 AC_ARG_ENABLE(seleng, 
 	       AC_HELP_STRING([--enable-seleng=yes|no|auto], 
-	                      [Enables the css2 selector engine based on libxml2. Default=auto]),
+	                      [Enables the css2 selector engine based on libxml2. Default=no]),
 	       WITH_SELENG=$enableval,
 	       WITH_SELENG="no")
 
@@ -190,7 +190,7 @@ dnl this option enable the layout engine/box model/style stuffs.
 CROCO_LAYENG_ENABLED=0
 AC_ARG_ENABLE(layeng,
 	AC_HELP_STRING([--enable-layeng=yes|no|auto],
-	[Enables the layout engine. Default=auto]),
+	[Enables the layout engine. Default=no]),
 	WITH_LAYENG=$enableval,
 	WITH_LAYENG="no")
 
@@ -321,13 +321,18 @@ Makefile
 libcroco.pc
 libcroco.spec
 croco-config
+docs/Makefile
+docs/examples/Makefile
+tests/Makefile
+tests/test-inputs/Makefile
+tests/test-output-refs/Makefile
 src/Makefile
 src/parser/Makefile
 src/parser/libcroco-config.h
 src/seleng/Makefile
 src/layeng/Makefile
 csslint/Makefile
-tests/Makefile
+
 ])
 
 dnl =============================================================================================
diff --git a/csslint/Makefile.am b/csslint/Makefile.am
index 6931cce..7efc024 100644
--- a/csslint/Makefile.am
+++ b/csslint/Makefile.am
@@ -7,10 +7,12 @@ croco_parser_lib=$(top_builddir)/src/parser/@CROCO_PARSER_LIB@
 
 if HAVE_SELENG
 croco_seleng_lib=$(top_builddir)/src/seleng/@CROCO_SELENG_LIB@
+croco_seleng_cflags=-I$(top_srcdir)/src/seleng @LIBXML2_CFLAGS@
 endif
 
 if HAVE_LAYENG
 croco_layeng_lib=$(top_builddir)/src/layeng/@CROCO_LAYENG_LIB@
+croco_layeng_cflags=-I$(top_srcdir)/src/layeng @LIBGNOMEUI2_CFLAGS@
 endif
 
 LDADD=$(croco_layeng_lib) $(croco_seleng_lib) $(croco_parser_lib) 
@@ -18,9 +20,9 @@ LDADD=$(croco_layeng_lib) $(croco_seleng_lib) $(croco_parser_lib)
 INCLUDES=-I$(top_srcdir)/intl \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/parser \
-	-I$(top_srcdir)/src/seleng \
-	-I$(top_srcdir)/src/layeng \
-	@GLIB2_CFLAGS@ @LIBXML2_CFLAGS@ @LIBGNOMEUI2_CFLAGS@
+	@GLIB2_CFLAGS@ \
+	$(croco_seleng_cflags) \
+	$(croco_layeng_cflags)
 
 AM_CFLAGS=$(INCLUDES)
 
diff --git a/docs/Makefile.am b/docs/Makefile.am
new file mode 100644
index 0000000..7b14bb4
--- /dev/null
+++ b/docs/Makefile.am
@@ -0,0 +1,3 @@
+SUBDIRS=examples
+
+EXTRA_DIST=usage.txt
diff --git a/docs/examples/Makefile.am b/docs/examples/Makefile.am
new file mode 100644
index 0000000..e960594
--- /dev/null
+++ b/docs/examples/Makefile.am
@@ -0,0 +1 @@
+EXTRA_DIST=cssom-example-1.c sac-example-1.c sac-example-2.c
diff --git a/src/layeng/Makefile.am b/src/layeng/Makefile.am
index ff297f0..c4214b6 100644
--- a/src/layeng/Makefile.am
+++ b/src/layeng/Makefile.am
@@ -1,11 +1,11 @@
 lib_LTLIBRARIES=libcrlayeng.la
 
 crlayengincdir=$(includedir)/@PACKAGE@/layeng
-crlayenginc_HEADERS= *.h
+crlayenginc_HEADERS= cr-box.h cr-box-view.h cr-lay-eng.h
 
 #the layout engine files
 if HAVE_LAYENG
-LAYENG_SRCS= cr-box.c cr-box-view.c cr-lay-eng.c
+LAYENG_SRCS= cr-box.c cr-box.h cr-box-view.c cr-box-view.h cr-lay-eng.c cr-lay-eng.h
 endif
 
 libcrlayeng_la_SOURCES=$(LAYENG_SRCS)
diff --git a/src/libcroco.h b/src/libcroco.h
index fe12e23..28a999d 100644
--- a/src/libcroco.h
+++ b/src/libcroco.h
@@ -31,7 +31,6 @@
 #include "parser/cr-selector.h"
 #include "parser/cr-enc-handler.h"
 #include "parser/cr-doc-handler.h"
-#include "parser/cr-parser-input.h"
 #include "parser/cr-input.h"
 #include "parser/cr-parser.h"
 #include "parser/cr-statement.h"
diff --git a/src/parser/Makefile.am b/src/parser/Makefile.am
index df4ce90..acc72be 100644
--- a/src/parser/Makefile.am
+++ b/src/parser/Makefile.am
@@ -1,33 +1,70 @@
 lib_LTLIBRARIES=libcroco.la
 
-
 crparserincdir=$(includedir)/@PACKAGE@/parser
-crparserinc_HEADERS=*.h
+crparserinc_HEADERS=cr-additional-sel.h \
+cr-attr-sel.h \
+cr-cascade.h \
+cr-declaration.h \
+cr-doc-handler.h \
+cr-enc-handler.h \
+cr-input.h \
+cr-num.h \
+cr-om-parser.h \
+cr-parser.h \
+cr-pseudo.h \
+cr-rgb.h \
+cr-selector.h \
+cr-simple-sel.h \
+cr-statement.h \
+cr-stylesheet.h \
+cr-term.h \
+cr-tknzr.h \
+cr-token.h \
+cr-utils.h \
+libcroco-config.h
 
 #the core parser files
 SRCS=\
 cr-utils.c \
+cr-utils.h \
 cr-input.c \
+cr-input.h \
 cr-enc-handler.c \
+cr-enc-handler.h \
 cr-num.c \
+cr-num.h \
 cr-rgb.c \
+cr-rgb.h \
 cr-token.c \
+cr-token.h \
 cr-tknzr.c \
+cr-tknzr.h \
 cr-term.c \
+cr-term.h \
 cr-attr-sel.c \
+cr-attr-sel.h \
 cr-pseudo.c \
+cr-pseudo.h \
 cr-additional-sel.c \
+cr-additional-sel.h \
 cr-simple-sel.c \
+cr-simple-sel.h \
 cr-selector.c \
+cr-selector.h \
 cr-doc-handler.c \
+cr-doc-handler.h \
 cr-parser.c \
+cr-parser.h \
 cr-declaration.c \
+cr-declaration.h \
 cr-statement.c \
+cr-statement.h \
 cr-stylesheet.c \
+cr-stylesheet.h \
 cr-cascade.c \
+cr-cascade.h \
 cr-om-parser.c \
-*.h
-
+cr-om-parser.h
 
 libcroco_la_SOURCES= $(SRCS)
 
diff --git a/src/parser/cr-doc-handler.h b/src/parser/cr-doc-handler.h
index 9a5a3b2..dde96c8 100644
--- a/src/parser/cr-doc-handler.h
+++ b/src/parser/cr-doc-handler.h
@@ -31,7 +31,7 @@
 
 #include <glib.h>
 #include "cr-utils.h"
-#include "cr-parser-input.h"
+#include "cr-input.h"
 #include "cr-stylesheet.h"
 
 G_BEGIN_DECLS
diff --git a/src/parser/cr-layout-eng.h b/src/parser/cr-layout-eng.h
deleted file mode 100644
index 184898c..0000000
--- a/src/parser/cr-layout-eng.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode:nil; c-basic-offset: 8-*- */
-
-/*
- * This file is part of The Croco Library
- *
- * Copyright (C) 2002-2003 Dodji Seketeli <dodji@seketeli.org>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2.1 of the 
- * GNU Lesser General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the 
- * GNU Lesser General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef __CR_LAY_ENG_H__
-#define __CR_LAY_ENG_H__
-
-#include "cr-utils.h"
-
-typedef struct _CRLayEngPriv CRLayEngPriv ;
-
-typedef struct
-{
-	CRLayoutEngPriv *priv ;
-} CRLayoutEng ;
-
-
-CRLayEng *
-cr_lay_eng_new (void) ;
-
-void
-cr_lay_eng_destroy (CRLayEng *a_this) ;
-
-#endif /*__CR_LAYOUT_ENG_H__*/
diff --git a/src/parser/cr-parser-input.h b/src/parser/cr-parser-input.h
deleted file mode 100644
index 97ca5d5..0000000
--- a/src/parser/cr-parser-input.h
+++ /dev/null
@@ -1,162 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: ni; c-basic-offset: 8 -*- */
-
-/*
- * This file is part of The Croco Library
- *
- * Copyright (C) 2002-2003 Dodji Seketeli <dodji@seketeli.org>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2.1 of the GNU Lesser General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef __CR_PARSER_INPUT_H__
-#define __CR_PARSER_INPUT_H__
-
-#include "cr-input.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif 
-
-	typedef struct _CRParserInput CRParserInput ;
-	typedef struct _CRParserInputPriv CRParserInputPriv ;
-
-	struct _CRParserInput 
-	{
-		CRParserInputPriv *priv ;
-	} ;
-
-	typedef struct _CRParserInputPos CRParserInputPos ;
-	
-	struct _CRParserInputPos
-	{
-		CRInputPos input_pos ;
-
-		/*not used yet*/
-		glong stack_size ;
-	} ;
-
-	CRParserInput *
-	cr_parser_input_new_from_uri (gchar *a_uri, enum CREncoding) ;
-	
-	void
-	cr_parser_input_ref (CRParserInput *a_this) ;
-
-	gboolean
-	cr_parser_input_unref (CRParserInput *a_this) ;
-
-	void
-	cr_parser_input_destroy (CRParserInput *a_this) ;
-
-	enum CRStatus
-	cr_parser_input_push_input (CRParserInput *a_this, 
-				    CRInput *a_input) ;
-
-	enum CRStatus
-	cr_parser_input_pop_input (CRParserInput *a_this) ;
-
-	CRInput *
-	cr_parser_input_peek_input (CRParserInput *a_this) ;
-
-	enum CRStatus
-	cr_parser_input_get_byte_addr (CRParserInput *a_this,
-				       gulong a_offset,
-				       guchar **a_addr) ;
-
-	enum CRStatus
-	cr_parser_input_get_cur_byte_addr (CRParserInput *a_this, 
-					   guchar **a_addr) ;
-	enum CRStatus
-	cr_parser_input_read_byte (CRParserInput *a_this, 
-				   guchar * a_byte) ;
-
-	enum CRStatus
-	cr_parser_input_read_char (CRParserInput *a_this, 
-				   guint32 * a_byte) ;
-
-	enum CRStatus
-        cr_parser_input_get_end_of_file (CRParserInput *a_this, 
-					 gboolean *a_eof) ;
-
-	enum CRStatus
-	cr_parser_input_consume_char (CRParserInput *a_this, 
-				      guint32 a_char) ;
-
-	enum CRStatus
-	cr_parser_input_consume_chars (CRParserInput *a_this, 
-				       guint32 a_char,
-				       glong *a_nb_char) ;
-
-	enum CRStatus
-	cr_parser_input_consume_spaces (CRParserInput *a_this, 
-					glong *a_nb_char) ;
-
-	enum CRStatus
-	cr_parser_input_peek_byte (CRParserInput *a_this,
-				   enum CRSeekPos a_origin,
-				   gulong a_offset, guchar *a_byte) ;
-
-	enum CRStatus
-	cr_parser_input_peek_char (CRParserInput *a_this,
-				   guint32 *a_char) ;
-
-	glong
-	cr_parser_input_get_nb_bytes_left (CRParserInput *a_this) ;
-
-	enum CRStatus
-	cr_parser_input_seek_index (CRParserInput *a_this,
-				    enum CRSeekPos a_origin,
-				    gint a_pos) ;
-
-	enum CRStatus
-	cr_parser_input_get_cur_pos (CRParserInput *a_this,
-				     CRParserInputPos *a_pos) ;
-
-	enum CRStatus
-	cr_parser_input_set_cur_pos (CRParserInput *a_this, 
-				     CRParserInputPos *a_pos) ;
-
-	enum CRStatus
-	cr_parser_input_set_line_num (CRParserInput *a_this, 
-				      glong a_line) ;
-	
-	enum CRStatus
-	cr_parser_input_set_col_num (CRParserInput *a_this, 
-				     glong a_col) ;
-	
-	enum CRStatus
-	cr_parser_input_incr_line_num (CRParserInput *a_this,
-				       glong a_increment) ;
-
-	enum CRStatus
-	cr_parser_input_incr_col_num (CRParserInput *a_this,
-				      glong a_increment) ;
-
-	enum CRStatus
-	cr_parser_input_get_col_num (CRParserInput *a_this, 
-				     glong *a_col) ;
-
-	enum CRStatus
-	cr_parser_input_get_line_num (CRParserInput *a_this, 
-				      glong *a_line) ;
-	
-	enum CRStatus
-        cr_parser_input_get_cur_index (CRParserInput *a_this, 
-                                       glong *a_index) ;
-	
-#ifdef __cplusplus
-} /*extern "C" {*/
-#endif 
-
-#endif /*__CR_PARSER_INPUT_H__*/
diff --git a/src/parser/cr-parser.c b/src/parser/cr-parser.c
index c95d75d..d6252a5 100644
--- a/src/parser/cr-parser.c
+++ b/src/parser/cr-parser.c
@@ -3432,7 +3432,7 @@ cr_parser_new (CRTknzr *a_tknzr)
         CRParser * result = NULL ;
         enum CRStatus status = CR_OK ;
 
-        result = g_malloc0 (sizeof (CRParserInput)) ;
+        result = g_malloc0 (sizeof (CRParser)) ;
 
         PRIVATE (result) = g_malloc0 (sizeof (CRParserPriv)) ;
 
diff --git a/src/parser/cr-parser.h b/src/parser/cr-parser.h
index 2d30aa9..4dc80cb 100644
--- a/src/parser/cr-parser.h
+++ b/src/parser/cr-parser.h
@@ -28,7 +28,7 @@
 #define  __CR_PARSER_H__
 
 #include <glib.h>
-#include "cr-parser-input.h"
+#include "cr-input.h"
 #include "cr-tknzr.h"
 #include "cr-utils.h"
 #include "cr-doc-handler.h"
diff --git a/src/parser/cr-tknzr.h b/src/parser/cr-tknzr.h
index 5658151..3a7765c 100644
--- a/src/parser/cr-tknzr.h
+++ b/src/parser/cr-tknzr.h
@@ -34,7 +34,7 @@
 #define __CR_TKNZR_H__
 
 #include "cr-utils.h"
-#include "cr-parser-input.h"
+#include "cr-input.h"
 #include "cr-token.h"
 
 G_BEGIN_DECLS
diff --git a/src/seleng/Makefile.am b/src/seleng/Makefile.am
index a122c07..06e6b34 100644
--- a/src/seleng/Makefile.am
+++ b/src/seleng/Makefile.am
@@ -1,11 +1,11 @@
 lib_LTLIBRARIES=libcrseleng.la
 
 crselengincdir=$(includedir)/@PACKAGE@/seleng
-crselenginc_HEADERS= *.h
+crselenginc_HEADERS= cr-fonts.h cr-sel-eng.h cr-style.h
 
 #the selection engine files
 if HAVE_SELENG
-SELENG_SRCS= cr-style.c cr-sel-eng.c cr-fonts.c
+SELENG_SRCS= cr-style.c cr-style.h cr-sel-eng.c cr-sel-eng.h cr-fonts.c cr-fonts.h
 endif
 
 libcrseleng_la_SOURCES=$(SELENG_SRCS)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ab49eec..8aa5ccd 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS=test-inputs test-output-refs
+
 if HAVE_TESTS
 
 core_tests=@CORE_TESTS@
diff --git a/tests/test-inputs/Makefile.am b/tests/test-inputs/Makefile.am
new file mode 100644
index 0000000..62d0338
--- /dev/null
+++ b/tests/test-inputs/Makefile.am
@@ -0,0 +1,11 @@
+EXTRA_DIST=test0.1.css \
+test1.css   \
+test2.1.css \
+test2.2.css \
+test2.css   \
+test3.1.css \
+test3.2.css \
+test3.css   \
+test4.1.css \
+test4.2.css \
+test5.1.css
diff --git a/tests/test-output-refs/Makefile.am b/tests/test-output-refs/Makefile.am
new file mode 100644
index 0000000..9e678b5
--- /dev/null
+++ b/tests/test-output-refs/Makefile.am
@@ -0,0 +1,13 @@
+EXTRA_DIST=test0.1.css.out \
+test1.css.out   \
+test2.1.css.out	\
+test2.2.css.out	\
+test2.css.out	\
+test3.1.css.out	\
+test3.2.css.out	\
+test3.css.out	\
+test4.1.css.out	\
+test4.2.css.out	\
+test5.1.css.out	\
+test6.out	\
+test7.out 
\ No newline at end of file
diff --git a/tests/test0-main.c b/tests/test0-main.c
index db3f7d8..ac1a55e 100644
--- a/tests/test0-main.c
+++ b/tests/test0-main.c
@@ -24,8 +24,8 @@
  *$Id$
  */
 
-#include "stdio.h"
-#include "cr-parser-input.h"
+#include <stdio.h>
+#include "cr-input.h"
 #include "string.h"
 
 /**
diff --git a/tests/test1-main.c b/tests/test1-main.c
index 647cdac..893b5d5 100644
--- a/tests/test1-main.c
+++ b/tests/test1-main.c
@@ -24,8 +24,8 @@
  *$Id$
  */
 
-#include "stdio.h"
-#include "cr-parser-input.h"
+#include <stdio.h>
+#include "cr-input.h"
 #include "string.h"
 
 /**
diff --git a/tests/testctl b/tests/testctl
index ff78c33..96a541b 100755
--- a/tests/testctl
+++ b/tests/testctl
@@ -194,7 +194,7 @@ cleanup_tests ()
 
 run_test_report ()
 {
-    diff -Nur --exclude=*CVS* --exclude=*cvs* $HERE/$TEST_OUT_REF_DIR $HERE/$TEST_OUTPUT_DIR > /tmp/toto$$
+    diff -ur --exclude=*CVS* --exclude=*cvs* --exclude=Makefile* $HERE/$TEST_OUT_REF_DIR $HERE/$TEST_OUTPUT_DIR > /tmp/toto$$
     NB_DIFF=`cat /tmp/toto$$ | wc -l`
 
     if test "$NB_DIFF" -eq 0 ; then