• R/O
  • SSH
  • HTTPS

comatz: Commit


Commit MetaInfo

Revisión5 (tree)
Tiempo2007-04-03 13:19:55
Autorkous

Log Message

* ./: added some dummy files to build.

Cambiar Resumen

Diferencia incremental

--- comatz/trunk/ext/ruby/rb-comatz.h (nonexistent)
+++ comatz/trunk/ext/ruby/rb-comatz.h (revision 5)
@@ -0,0 +1,34 @@
1+/* -*- c-file-style: ruby; indent-tabs-mode: nil -*- */
2+
3+/*
4+ * Copyright (C) 2007 Kouhei Sutou <kou@cozmixng.org>
5+ *
6+ * This library is free software; you can redistribute it and/or
7+ * modify it under the terms of the GNU Lesser General Public
8+ * License as published by the Free Software Foundation; either
9+ * version 2 of the License, or (at your option) any later version.
10+ *
11+ * This library is distributed in the hope that it will be useful,
12+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
13+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+ * GNU Lesser General Public License for more details.
15+ *
16+ * You should have received a copy of the GNU Lesser General Public
17+ * License along with this program; if not, write to the
18+ * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
19+ * Boston, MA 02111-1307 USA
20+ *
21+ * $Id: comatz.h 923 2006-12-01 01:40:38Z ikezoe $
22+ */
23+
24+#ifndef __RB_COMATZ_H__
25+#define __RB_COMATZ_H__
26+
27+#include <glib.h>
28+#include <ruby.h>
29+
30+G_BEGIN_DECLS
31+
32+G_END_DECLS
33+
34+#endif /* __RB_COMATZ_H__ */
--- comatz/trunk/ext/ruby/Makefile.am (revision 4)
+++ comatz/trunk/ext/ruby/Makefile.am (revision 5)
@@ -4,23 +4,22 @@
44
55 EXTRA_DIST = $(ruby_lib_DATA)
66
7-ruby_ext_HEADERS = rbcomatz.h
7+ruby_ext_HEADERS = rb-comatz.h
88 ruby_ext_LTLIBRARIES = comatz.la
99
10-INCLUDES = \
11- $(COMATZ_CFLAGS) \
10+INCLUDES = \
11+ $(COMATZ_CFLAGS) \
1212 $(RUBY_CFLAGS)
1313
1414 comatz_la_SOURCES =
1515
16-
1716 comatz_la_LDFLAGS = \
1817 -module \
19- -version-info $(LT_VERSION_INFO) \
18+ -avoid-verion \
2019 $(RUBY_LDFLAGS) \
2120 $(RUBY_EXT_LDFLAGS)
2221
23-comatz_la_LIBADD = \
24- $(COMATZ_LIBS) \
25- $(RUBY_LIBS) \
26- $(top_builddir)/lib/libcomatz.la
22+comatz_la_LIBADD = \
23+ $(COMATZ_LIBS) \
24+ $(RUBY_LIBS) \
25+ $(top_builddir)/comatz/libcomatz.la
--- comatz/trunk/comatz.pc.in (revision 4)
+++ comatz/trunk/comatz.pc.in (revision 5)
@@ -1,11 +1,11 @@
11 prefix=@prefix@
22 exec_prefix=@exec_prefix@
33 libdir=@libdir@
4-includedir=@includedir@
4+includedir=@includedir@/@PACKAGE@
55
66 Name: coMatz
77 Description: Respecting for Matz and Komatsu
88 Version: @VERSION@
9-Requires: glib-2.0 >= 2.4
9+Requires: glib-2.0 >= 2.6
1010 Libs: -L${libdir} -lcomatz
11-Cflags: -I${includedir}/comatz
11+Cflags: -I${includedir}
--- comatz/trunk/configure.ac (revision 4)
+++ comatz/trunk/configure.ac (revision 5)
@@ -222,17 +222,18 @@
222222 AM_CONDITIONAL([WITH_RUBY], [test "$ruby_available" = "yes"])
223223
224224 dnl **************************************************************
225-dnl Configure for Tomoe.
225+dnl Configure for coMatz.
226226 dnl **************************************************************
227227
228+enum_types_prefix="cm-enum-types"
229+AC_SUBST(enum_types_prefix)
230+
228231 COMATZ_CFLAGS="$COMATZ_CFLAGS \$(GLIB_CFLAGS)"
229232 COMATZ_CFLAGS="$COMATZ_CFLAGS -DCONFDIR=\\\"\"\$(confdir)\"\\\""
230233 COMATZ_CFLAGS="$COMATZ_CFLAGS -DDATADIR=\\\"\"\$(pkgdatadir)\"\\\""
231234 COMATZ_CFLAGS="$COMATZ_CFLAGS -DDICT_DATADIR=\\\"\"\$(dict_datadir)\"\\\""
232-COMATZ_CFLAGS="$COMATZ_CFLAGS -DRECOGNIZER_DATADIR=\\\"\"\$(recognizer_datadir)\"\\\""
233-COMATZ_CFLAGS="$COMATZ_CFLAGS -DDICT_MODULEDIR=\\\"\"\$(dict_moduledir)\"\\\""
234-COMATZ_CFLAGS="$COMATZ_CFLAGS -DRECOGNIZER_MODULEDIR=\\\"\"\$(recognizer_moduledir)\"\\\""
235-COMATZ_CFLAGS="$COMATZ_CFLAGS -I\$(top_srcdir)/lib"
235+COMATZ_CFLAGS="$COMATZ_CFLAGS -I\$(srcdir)"
236+COMATZ_CFLAGS="$COMATZ_CFLAGS -I\$(top_srcdir)"
236237 AC_SUBST(COMATZ_CFLAGS)
237238
238239 COMATZ_LIBS='$(GLIB_LIBS)'
--- comatz/trunk/ChangeLog (nonexistent)
+++ comatz/trunk/ChangeLog (revision 5)
@@ -0,0 +1,6 @@
1+2007-04-03 Kouhei Sutou <kou@cozmixng.org>
2+
3+ * ./: added some dummy files to build.
4+
5+ * po/: supported.
6+
--- comatz/trunk/Makefile.am (revision 4)
+++ comatz/trunk/Makefile.am (revision 5)
@@ -18,7 +18,7 @@
1818 ## Free Software Foundation, Inc., 59 Temple Place, Suite 330,
1919 ## Boston, MA 02111-1307 USA
2020
21-SUBDIRS = ext test
21+SUBDIRS = comatz ext test
2222
2323 EXTRA_DIST = autogen.sh comatz.pc
2424
--- comatz/trunk/comatz/comatz.h (nonexistent)
+++ comatz/trunk/comatz/comatz.h (revision 5)
@@ -0,0 +1,40 @@
1+/* -*- mode: c; c-file-style: gnu; indent-tabs-mode: nil -*- */
2+
3+/*
4+ * Copyright (C) 2007 Kouhei Sutou <kou@cozmixng.org>
5+ *
6+ * This library is free software; you can redistribute it and/or
7+ * modify it under the terms of the GNU Lesser General Public
8+ * License as published by the Free Software Foundation; either
9+ * version 2 of the License, or (at your option) any later version.
10+ *
11+ * This library is distributed in the hope that it will be useful,
12+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
13+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+ * GNU Lesser General Public License for more details.
15+ *
16+ * You should have received a copy of the GNU Lesser General Public
17+ * License along with this program; if not, write to the
18+ * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
19+ * Boston, MA 02111-1307 USA
20+ *
21+ * $Id: comatz.h 923 2006-12-01 01:40:38Z ikezoe $
22+ */
23+
24+#ifndef __COMATZ_H__
25+#define __COMATZ_H__
26+
27+#include <glib.h>
28+
29+G_BEGIN_DECLS
30+
31+#include <comatz/cm-dict.h>
32+
33+#include <comatz/cm-enum-types.h>
34+
35+void cm_init (void);
36+void cm_quit (void);
37+
38+G_END_DECLS
39+
40+#endif /* __COMATZ_H__ */
--- comatz/trunk/comatz/cm-dict.h (nonexistent)
+++ comatz/trunk/comatz/cm-dict.h (revision 5)
@@ -0,0 +1,33 @@
1+/* -*- mode: c; c-file-style: gnu; indent-tabs-mode: nil -*- */
2+
3+/*
4+ * Copyright (C) 2007 Kouhei Sutou <kou@cozmixng.org>
5+ *
6+ * This library is free software; you can redistribute it and/or
7+ * modify it under the terms of the GNU Lesser General Public
8+ * License as published by the Free Software Foundation; either
9+ * version 2 of the License, or (at your option) any later version.
10+ *
11+ * This library is distributed in the hope that it will be useful,
12+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
13+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+ * GNU Lesser General Public License for more details.
15+ *
16+ * You should have received a copy of the GNU Lesser General Public
17+ * License along with this program; if not, write to the
18+ * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
19+ * Boston, MA 02111-1307 USA
20+ *
21+ * $Id: comatz.h 923 2006-12-01 01:40:38Z ikezoe $
22+ */
23+
24+#ifndef __CM_DICT_H__
25+#define __CM_DICT_H__
26+
27+#include <glib.h>
28+
29+G_BEGIN_DECLS
30+
31+G_END_DECLS
32+
33+#endif /* __CM_DICT_H__ */
--- comatz/trunk/comatz/Makefile.am (revision 4)
+++ comatz/trunk/comatz/Makefile.am (revision 5)
@@ -1,7 +1,7 @@
11 # -*- Mode: Makefile; tab-width: 8; indent-tabs-mode: t; -*-
22
3-## Makefile.am -- Process this file with automake to produce Makefile.in
4-## Copyright (C) 2005 Takuro Ashie <ashie@homa.ne.jp>
3+## Copyright (C) 2007 Hiroyuki Ikezoe
4+## Copyright (C) 2007 Kouhei Sutou <kou@cozmixng.org>
55 ##
66 ## This library is free software; you can redistribute it and/or
77 ## modify it under the terms of the GNU Lesser General Public
@@ -23,33 +23,39 @@
2323 AM_CPPFLAGS = -DG_LOG_DOMAIN=\"coMatz\"
2424 INCLUDES = $(COMATZ_CFLAGS)
2525
26-comatz_public_h_sources =
26+comatz_public_h_sources = \
27+ cm-dict.h
2728
28-enum_source_prefix = comatz-enum-types
29+enum_types_c = $(enum_types_prefix).c
30+enum_types_h = $(enum_types_prefix).h
31+enum_types_sources = \
32+ $(enum_types_c) \
33+ $(enum_types_h)
2934
30-enum_sources_h = \
35+enum_sources_h = \
3136 $(comatz_public_h_sources)
3237
33-enum_sources = \
34- $(enum_source_prefix).c \
35- $(enum_source_prefix).h
38+BUILT_SOURCES = $(enum_types_sources)
3639
37-BUILT_SOURCES = $(enum_sources)
40+pkginclude_HEADERS = \
41+ comatz.h
3842
39-pkginclude_HEADERS = \
40- $(comatz_public_h_sources) \
41- $(enum_source_prefix).h
43+pkgsubincludedir = $(pkgincludedir)/comatz
44+pkgsubinclude_HEADERS = \
45+ $(comatz_public_h_sources) \
46+ $(enum_types_h)
4247
4348 lib_LTLIBRARIES = libcomatz.la
4449
45-libcomatz_la_SOURCES =
50+libcomatz_la_SOURCES = \
51+ comatz.c \
52+ @enum_types_prefix@.c
4653
4754 libcomatz_la_LDFLAGS = \
4855 -version-info $(LT_VERSION_INFO) \
4956 -export-dynamic $(no_undefined) $(LIBTOOL_EXPORT_OPTIONS)
5057
51-libcomatz_la_LD_ADD = \
52- -lm
58+libcomatz_la_LD_ADD =
5359
5460 libcomatz_la_LIBADD = $(COMATZ_LIBS)
5561
@@ -58,10 +64,10 @@
5864 stamp-$(enum_source_prefix)-c \
5965 stamp-$(enum_source_prefix)-h
6066
61-$(enum_source_prefix).c: stamp-$(enum_source_prefix)-c $(enum_source_prefix).h
67+$(enum_types_c): stamp-$(enum_types_prefix)-c $(enum_types_h)
6268 @true
6369
64-stamp-$(enum_source_prefix)-c: $(enum_sources_h) Makefile
70+stamp-$(enum_types_prefix)-c: $(enum_sources_h) Makefile
6571 (cd $(srcdir) && \
6672 include_headers="" && \
6773 for h in $(enum_sources_h); do \
@@ -68,21 +74,21 @@
6874 include_headers="$${include_headers}#include \"$${h}\"\n"; \
6975 done && \
7076 $(GLIB_MKENUMS) \
71- --fhead "#include \"$(enum_source_prefix).h\"\n$${include_headers}" \
77+ --fhead "#include \"$(enum_types_h)\"\n$${include_headers}" \
7278 --fprod "\n/* enumerations from \"@filename@\" */" \
7379 --vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \
7480 --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
7581 --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \
76- $(enum_sources_h)) > tmp-$(enum_source_prefix).c && \
77- (cmp -s tmp-$(enum_source_prefix).c $(enum_source_prefix).c || \
78- cp tmp-$(enum_source_prefix).c $(enum_source_prefix).c ) && \
79- rm -f tmp-$(enum_source_prefix).c && \
82+ $(enum_sources_h)) > tmp-$(enum_types_c) && \
83+ (cmp -s tmp-$(enum_types_c) $(enum_types_c) || \
84+ cp tmp-$(enum_types_c) $(enum_types_c) ) && \
85+ rm -f tmp-$(enum_types_c) && \
8086 echo timestamp > $(@F)
8187
82-$(enum_source_prefix).h: stamp-$(enum_source_prefix)-h
88+$(enum_types_h): stamp-$(enum_types_prefix)-h
8389 @true
8490
85-stamp-$(enum_source_prefix)-h: $(enum_sources_h) Makefile
91+stamp-$(enum_types_prefix)-h: $(enum_sources_h) Makefile
8692 (cd $(srcdir) && \
8793 mark="__`echo $(enum_source_prefix) | sed -e 's/-/_/g' | tr a-z A-Z`_H__" && \
8894 $(GLIB_MKENUMS) \
@@ -90,8 +96,8 @@
9096 --fprod "/* enumerations from \"@filename@\" */\n" \
9197 --vhead "GType @enum_name@_get_type (void);\n#define COMATZ_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \
9298 --ftail "G_END_DECLS\n\n#endif /* $${mark} */" \
93- $(enum_sources_h)) > tmp-$(enum_source_prefix).h && \
94- (cmp -s tmp-$(enum_source_prefix).h $(enum_source_prefix).h || \
95- cp tmp-$(enum_source_prefix).h $(enum_source_prefix).h) && \
96- rm -f tmp-$(enum_source_prefix).h && \
99+ $(enum_sources_h)) > tmp-$(enum_types_h) && \
100+ (cmp -s tmp-$(enum_types_h) $(enum_types_h) || \
101+ cp tmp-$(enum_types_h) $(enum_types_h)) && \
102+ rm -f tmp-$(enum_types_h) && \
97103 echo timestamp > $(@F)
--- comatz/trunk/comatz/comatz.c (nonexistent)
+++ comatz/trunk/comatz/comatz.c (revision 5)
@@ -0,0 +1,34 @@
1+/* -*- mode: c; c-file-style: gnu; indent-tabs-mode: nil -*- */
2+
3+/*
4+ * Copyright (C) 2007 Kouhei Sutou <kou@cozmixng.org>
5+ *
6+ * This library is free software; you can redistribute it and/or
7+ * modify it under the terms of the GNU Lesser General Public
8+ * License as published by the Free Software Foundation; either
9+ * version 2 of the License, or (at your option) any later version.
10+ *
11+ * This library is distributed in the hope that it will be useful,
12+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
13+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+ * GNU Lesser General Public License for more details.
15+ *
16+ * You should have received a copy of the GNU Lesser General Public
17+ * License along with this program; if not, write to the
18+ * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
19+ * Boston, MA 02111-1307 USA
20+ *
21+ * $Id: comatz.h 923 2006-12-01 01:40:38Z ikezoe $
22+ */
23+
24+#include "comatz.h"
25+
26+void
27+cm_init (void)
28+{
29+}
30+
31+void
32+cm_quit (void)
33+{
34+}
Show on old repository browser