GNOME.org
 

[lasem] build: split enumtypes file build in 3 modules (dom, mathml, svg).

commit 12f71ff2b59aff17db2a593f9311b5a2752733a3
Author: Emmanuel Pacaud <emmanuel gnome org>
Date:   Sun Nov 7 19:04:24 2010 +0100

    build: split enumtypes file build in 3 modules (dom, mathml, svg).

 .gitignore                                         |    1 +
 docs/reference/lasem/Makefile.am                   |    4 +-
 src/.gitignore                                     |    4 +-
 src/Makefile.am                                    |   60 ++++++++++++++-----
 src/lsm.h                                          |   20 +------
 ...types.c.template => lsmdomenumtypes.c.template} |    2 +-
 ...types.h.template => lsmdomenumtypes.h.template} |    6 +-
 ...es.c.template => lsmmathmlenumtypes.c.template} |    2 +-
 ...es.h.template => lsmmathmlenumtypes.h.template} |    6 +-
 ...types.c.template => lsmsvgenumtypes.c.template} |    2 +-
 ...types.h.template => lsmsvgenumtypes.h.template} |    6 +-
 src/lsmtypes.h                                     |   47 +++++++++++++++
 12 files changed, 110 insertions(+), 50 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ce1a87d..4914221 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,7 @@ tags
 *.lineno
 *.swp
 *.stamp
+*.bak
 lasem.svg
 lasem*.pc
 lasemtest.xml
diff --git a/docs/reference/lasem/Makefile.am b/docs/reference/lasem/Makefile.am
index 7cfa008..9fb1548 100644
--- a/docs/reference/lasem/Makefile.am
+++ b/docs/reference/lasem/Makefile.am
@@ -61,7 +61,9 @@ EXTRA_HFILES=
 # Header files to ignore when scanning. Use base file name, no paths
 # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
 IGNORE_HFILES=\
-	lsmenumtypes.h 	\
+	lsmdomenumtypes.h 	\
+	lsmmathmlenumtypes.h 	\
+	lsmsvgenumtypes.h 	\
 	lsmconfig.h
 
 # Images to copy into HTML directory.
diff --git a/src/.gitignore b/src/.gitignore
index 1cb4acb..6f49a06 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -5,7 +5,7 @@
 .libs
 lasemrender
 *.swp
-lsmenumtypes.c
-lsmenumtypes.h
+*enumtypes.c
+*enumtypes.h
 *.gir
 *.typelib
diff --git a/src/Makefile.am b/src/Makefile.am
index d7b8a80..3f53616 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,17 +15,26 @@ AM_CFLAGS = -Wall
 
 lib_LTLIBRARIES = liblasem- LASEM_API_VERSION@.la
 
-BUILT_SOURCES = lsmenumtypes.h lsmenumtypes.c
+BUILT_SOURCES = lsmdomenumtypes.h	\
+		lsmdomenumtypes.c	\
+		lsmmathmlenumtypes.h	\
+		lsmmathmlenumtypes.c	\
+		lsmsvgenumtypes.h	\
+		lsmsvgenumtypes.c
 
-EXTRA_DIST = lsmenumtypes.h.template \
-	     lsmenumtypes.c.template
+EXTRA_DIST = lsmdomenumtypes.h.template 	\
+	     lsmdomenumtypes.c.template		\
+	     lsmmathmlenumtypes.h.template 	\
+	     lsmmathmlenumtypes.c.template	\
+	     lsmsvgenumtypes.h.template 	\
+	     lsmsvgenumtypes.c.template
 
-liblasem_ LASEM_API_VERSION@_la_LIBADD = 				\
+liblasem_ LASEM_API_VERSION@_la_LIBADD = 	\
 	../itex2mml/libitex2mml.la		\
 	$(LASEM_LIBS)
 
-liblasem_ LASEM_API_VERSION@_la_SOURCES =				\
-	lsmenumtypes.c				\
+liblasem_ LASEM_API_VERSION@_la_SOURCES =	\
+	lsmdomenumtypes.c			\
 	lsmdebug.c				\
 	lsmstr.c				\
 	lsmtraits.c				\
@@ -41,6 +50,7 @@ liblasem_ LASEM_API_VERSION@_la_SOURCES =				\
 	lsmdomview.c				\
 	lsmdomparser.c				\
 	lsmdomimplementation.c			\
+	lsmmathmlenumtypes.c			\
 	lsmmathmlenums.c			\
 	lsmmathmltraits.c			\
 	lsmmathmlattributes.c			\
@@ -76,6 +86,7 @@ liblasem_ LASEM_API_VERSION@_la_SOURCES =				\
 	lsmmathmlitexelement.c			\
 	lsmmathmlutils.c			\
 	lsmmathmllayoututils.c			\
+	lsmsvgenumtypes.c			\
 	lsmsvgenums.c				\
 	lsmsvgtraits.c				\
 	lsmsvgstyle.c				\
@@ -112,15 +123,16 @@ liblasem_ LASEM_API_VERSION@_la_SOURCES =				\
 	lsmsvgfilterprimitive.c			\
 	lsmsvgfiltergaussianblur.c
 
-LASEM_HDRS = \
+LASEM_DOM_HDRS = 				\
 	lsm.h					\
+	lsmtypes.h				\
+	lsmcairo.h				\
 	lsmstr.h				\
 	lsmdebug.h				\
 	lsmtraits.h				\
 	lsmproperties.h				\
 	lsmattributes.h				\
 	lsmdom.h				\
-	lsmcairo.h				\
 	lsmdomnode.h				\
 	lsmdomnodelist.h			\
 	lsmdomdocument.h			\
@@ -129,7 +141,9 @@ LASEM_HDRS = \
 	lsmdomtext.h				\
 	lsmdomview.h				\
 	lsmdomparser.h				\
-	lsmdomimplementation.h			\
+	lsmdomimplementation.h
+
+LASEM_MATHML_HDRS =				\
 	lsmmathml.h				\
 	lsmmathmlenums.h			\
 	lsmmathmltraits.h			\
@@ -165,7 +179,9 @@ LASEM_HDRS = \
 	lsmmathmlaligngroupelement.h		\
 	lsmmathmlitexelement.h			\
 	lsmmathmlutils.h			\
-	lsmmathmllayoututils.h			\
+	lsmmathmllayoututils.h
+
+LASEM_SVG_HDRS =				\
 	lsmsvg.h				\
 	lsmsvgenums.h				\
 	lsmsvgtraits.h				\
@@ -205,15 +221,27 @@ LASEM_HDRS = \
 	lsmsvgfiltergaussianblur.h
 
 liblasem_ LASEM_API_VERSION@_ladir = $(includedir)/lasem- LASEM_API_VERSION@
-liblasem_ LASEM_API_VERSION@_la_HEADERS = $(LASEM_HDRS)
-liblasem_ LASEM_API_VERSION@_la_HEADERS += lsmenumtypes.h
+liblasem_ LASEM_API_VERSION@_la_HEADERS = $(LASEM_DOM_HDRS) $(LASEM_MATHML_HDRS) $(LASEM_SVG_HDRS)
+liblasem_ LASEM_API_VERSION@_la_HEADERS += lsmdomenumtypes.h lsmmathmlenumtypes.h lsmsvgenumtypes.h
 liblasem_ LASEM_API_VERSION@_la_LDFLAGS = -version-info $(LASEM_LIBTOOL_VERSION)
 
-lsmenumtypes.h: lsmenumtypes.h.template $(LASEM_HDRS) $(GLIB_MKENUMS)
-	$(AM_V_GEN) (cd $(srcdir) && $(GLIB_MKENUMS) --template lsmenumtypes.h.template $(liblasem_ LASEM_API_VERSION@_la_HEADERS)) > $@
+lsmdomenumtypes.h: lsmdomenumtypes.h.template $(LASEM_DOM_HDRS) $(GLIB_MKENUMS)
+	$(AM_V_GEN) (cd $(srcdir) && $(GLIB_MKENUMS) --template lsmdomenumtypes.h.template $(LASEM_DOM_HDRS)) > $@
+
+lsmdomenumtypes.c: lsmdomenumtypes.c.template $(LASEM_DOM_HDRS) $(GLIB_MKENUMS)
+	$(AM_V_GEN) (cd $(srcdir) && $(GLIB_MKENUMS) --template lsmdomenumtypes.c.template $(LASEM_DOM_HDRS)) > $@
+
+lsmmathmlenumtypes.h: lsmmathmlenumtypes.h.template $(LASEM_MATHML_HDRS) $(GLIB_MKENUMS)
+	$(AM_V_GEN) (cd $(srcdir) && $(GLIB_MKENUMS) --template lsmmathmlenumtypes.h.template $(LASEM_MATHML_HDRS)) > $@
+
+lsmmathmlenumtypes.c: lsmmathmlenumtypes.c.template $(LASEM_MATHML_HDRS) $(GLIB_MKENUMS)
+	$(AM_V_GEN) (cd $(srcdir) && $(GLIB_MKENUMS) --template lsmmathmlenumtypes.c.template $(LASEM_MATHML_HDRS)) > $@
+
+lsmsvgenumtypes.h: lsmsvgenumtypes.h.template $(LASEM_SVG_HDRS) $(GLIB_MKENUMS)
+	$(AM_V_GEN) (cd $(srcdir) && $(GLIB_MKENUMS) --template lsmsvgenumtypes.h.template $(LASEM_SVG_HDRS)) > $@
 
-lsmenumtypes.c: lsmenumtypes.c.template $(LASEM_HDRS) $(GLIB_MKENUMS)
-	$(AM_V_GEN) (cd $(srcdir) && $(GLIB_MKENUMS) --template lsmenumtypes.c.template $(liblasem_ LASEM_API_VERSION@_la_HEADERS)) > $@
+lsmsvgenumtypes.c: lsmsvgenumtypes.c.template $(LASEM_SVG_HDRS) $(GLIB_MKENUMS)
+	$(AM_V_GEN) (cd $(srcdir) && $(GLIB_MKENUMS) --template lsmsvgenumtypes.c.template $(LASEM_SVG_HDRS)) > $@
 
 bin_PROGRAMS = lasemrender
 
diff --git a/src/lsm.h b/src/lsm.h
index 48deaea..64c2405 100644
--- a/src/lsm.h
+++ b/src/lsm.h
@@ -23,24 +23,6 @@
 #ifndef LSM_H
 #define LSM_H
 
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-typedef struct {
-	double x1;
-	double y1;
-	double x2;
-	double y2;
-} LsmExtents;
-
-typedef struct {
-	double x;
-	double y;
-	double width;
-	double height;
-} LsmBox;
-
-G_END_DECLS
+#include <lsmtypes.h>
 
 #endif
diff --git a/src/lsmenumtypes.c.template b/src/lsmdomenumtypes.c.template
similarity index 95%
copy from src/lsmenumtypes.c.template
copy to src/lsmdomenumtypes.c.template
index a4cd708..e6cf222 100644
--- a/src/lsmenumtypes.c.template
+++ b/src/lsmdomenumtypes.c.template
@@ -1,5 +1,5 @@
 /*** BEGIN file-header ***/
-#include "lsmenumtypes.h"
+#include "lsmdomenumtypes.h"
 
 /*** END file-header ***/
 
diff --git a/src/lsmenumtypes.h.template b/src/lsmdomenumtypes.h.template
similarity index 82%
copy from src/lsmenumtypes.h.template
copy to src/lsmdomenumtypes.h.template
index 528cd5d..bba8054 100644
--- a/src/lsmenumtypes.h.template
+++ b/src/lsmdomenumtypes.h.template
@@ -1,6 +1,6 @@
 /*** BEGIN file-header ***/
-#ifndef LSM_ENUM_TYPES_H
-#define LSM_ENUM_TYPES_H
+#ifndef LSM_DOM_ENUM_TYPES_H
+#define LSM_DOM_ENUM_TYPES_H
 
 #include <glib-object.h>
 
@@ -22,5 +22,5 @@ GType @enum_name _get_type	(void) G_GNUC_CONST;
 /*** BEGIN file-tail ***/
 G_END_DECLS
 
-#endif /* LSM_ENUM_TYPES_H */
+#endif /* LSM_DOM_ENUM_TYPES_H */
 /*** END file-tail ***/
diff --git a/src/lsmenumtypes.c.template b/src/lsmmathmlenumtypes.c.template
similarity index 95%
copy from src/lsmenumtypes.c.template
copy to src/lsmmathmlenumtypes.c.template
index a4cd708..93b4aec 100644
--- a/src/lsmenumtypes.c.template
+++ b/src/lsmmathmlenumtypes.c.template
@@ -1,5 +1,5 @@
 /*** BEGIN file-header ***/
-#include "lsmenumtypes.h"
+#include "lsmmathmlenumtypes.h"
 
 /*** END file-header ***/
 
diff --git a/src/lsmenumtypes.h.template b/src/lsmmathmlenumtypes.h.template
similarity index 81%
copy from src/lsmenumtypes.h.template
copy to src/lsmmathmlenumtypes.h.template
index 528cd5d..0e5ac52 100644
--- a/src/lsmenumtypes.h.template
+++ b/src/lsmmathmlenumtypes.h.template
@@ -1,6 +1,6 @@
 /*** BEGIN file-header ***/
-#ifndef LSM_ENUM_TYPES_H
-#define LSM_ENUM_TYPES_H
+#ifndef LSM_MATHML_ENUM_TYPES_H
+#define LSM_MATHML_ENUM_TYPES_H
 
 #include <glib-object.h>
 
@@ -22,5 +22,5 @@ GType @enum_name _get_type	(void) G_GNUC_CONST;
 /*** BEGIN file-tail ***/
 G_END_DECLS
 
-#endif /* LSM_ENUM_TYPES_H */
+#endif /* LSM_MATHML_ENUM_TYPES_H */
 /*** END file-tail ***/
diff --git a/src/lsmenumtypes.c.template b/src/lsmsvgenumtypes.c.template
similarity index 95%
rename from src/lsmenumtypes.c.template
rename to src/lsmsvgenumtypes.c.template
index a4cd708..56fd0dc 100644
--- a/src/lsmenumtypes.c.template
+++ b/src/lsmsvgenumtypes.c.template
@@ -1,5 +1,5 @@
 /*** BEGIN file-header ***/
-#include "lsmenumtypes.h"
+#include "lsmsvgenumtypes.h"
 
 /*** END file-header ***/
 
diff --git a/src/lsmenumtypes.h.template b/src/lsmsvgenumtypes.h.template
similarity index 82%
rename from src/lsmenumtypes.h.template
rename to src/lsmsvgenumtypes.h.template
index 528cd5d..d1c37a3 100644
--- a/src/lsmenumtypes.h.template
+++ b/src/lsmsvgenumtypes.h.template
@@ -1,6 +1,6 @@
 /*** BEGIN file-header ***/
-#ifndef LSM_ENUM_TYPES_H
-#define LSM_ENUM_TYPES_H
+#ifndef LSM_SVG_ENUM_TYPES_H
+#define LSM_SVG_ENUM_TYPES_H
 
 #include <glib-object.h>
 
@@ -22,5 +22,5 @@ GType @enum_name _get_type	(void) G_GNUC_CONST;
 /*** BEGIN file-tail ***/
 G_END_DECLS
 
-#endif /* LSM_ENUM_TYPES_H */
+#endif /* LSM_SVG_ENUM_TYPES_H */
 /*** END file-tail ***/
diff --git a/src/lsmtypes.h b/src/lsmtypes.h
new file mode 100644
index 0000000..c7ac69d
--- /dev/null
+++ b/src/lsmtypes.h
@@ -0,0 +1,47 @@
+/* Lasem - SVG and Mathml library
+ *
+ * Copyright © 2007-2010 Emmanuel Pacaud
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Author:
+ * 	Emmanuel Pacaud <emmanuel gnome org>
+ */
+
+#ifndef LSM_TYPES_H
+#define LSM_TYPES_H
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+typedef struct {
+	double x1;
+	double y1;
+	double x2;
+	double y2;
+} LsmExtents;
+
+typedef struct {
+	double x;
+	double y;
+	double width;
+	double height;
+} LsmBox;
+
+G_END_DECLS
+
+#endif
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]