OSDN Git Service

(root) / modchxj / mod_chxj.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 70440b2 1cef58a)
Merge branch 'branch_0.12.0'
authorAtsushi Konno <konn@users.sourceforge.jp>
Wed, 10 Dec 2008 15:57:36 +0000 (00:57 +0900)
committerAtsushi Konno <konn@users.sourceforge.jp>
Wed, 10 Dec 2008 15:57:36 +0000 (00:57 +0900)
(0.12.26)

Conflicts:
configure
configure.ac
include/config.h
include/mod_chxj.h
src/Makefile.am
src/Makefile.in
src/chxj_chtml20.c
src/chxj_xhtml_mobile_1_0.c
support/centos/mod-chxj.spec

15 files changed:
1  2 
Makefile.in patch | diff1 | diff2 | blob | history
include/mod_chxj.h patch | diff1 | diff2 | blob | history
src/Makefile.am patch | diff1 | diff2 | blob | history
src/Makefile.in patch | diff1 | diff2 | blob | history
src/chxj_chtml10.c patch | diff1 | diff2 | blob | history
src/chxj_chtml20.c patch | diff1 | diff2 | blob | history
src/chxj_chtml30.c patch | diff1 | diff2 | blob | history
src/chxj_chtml40.c patch | diff1 | diff2 | blob | history
src/chxj_chtml50.c patch | diff1 | diff2 | blob | history
src/chxj_encoding.c patch | diff1 | diff2 | blob | history
src/chxj_jhtml.c patch | diff1 | diff2 | blob | history
src/chxj_jxhtml.c patch | diff1 | diff2 | blob | history
src/chxj_tag_util.c patch | diff1 | diff2 | blob | history
src/chxj_xhtml_mobile_1_0.c patch | diff1 | diff2 | blob | history
src/mod_chxj.c patch | diff1 | diff2 | blob | history

diff --cc Makefile.in
index c5d4cd3,c5d4cd3..9d9a46a
--- 1/Makefile.in
--- 2/Makefile.in
+++ b/Makefile.in
@@@ -38,7 -38,7 +38,7 @@@ DIST_COMMON = README $(am__configure_de
        $(top_srcdir)/include/config.h.in \
        $(top_srcdir)/support/centos/mod-chxj.spec.in AUTHORS COPYING \
        ChangeLog INSTALL NEWS TODO compile config.guess config.sub \
--      depcomp install-sh ltmain.sh missing ylwrap
++      depcomp install-sh ltmain.sh missing
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  am__aclocal_m4_deps = $(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
diff --cc include/mod_chxj.h
index f5b4198,a3a877a..f2ce9b5
--- 1/include/mod_chxj.h
--- 2/include/mod_chxj.h
+++ b/include/mod_chxj.h
@@@ -370,18 -369,25 +370,28 @@@ struct mod_chxj_config 
  #define CONVRULE_ENGINE_ON_BIT        (0x00000001)
  #define CONVRULE_ENGINE_OFF_BIT       (0x00000002)
  #define CONVRULE_COOKIE_ON_BIT        (0x00000004)
 -#define CONVRULE_Z2H_ON_BIT           (0x00000008)
 -#define CONVRULE_Z2H_OFF_BIT          (0x00000010)
 -#define CONVRULE_Z2H_ALPHA_ON_BIT     (0x00000020)
 -#define CONVRULE_Z2H_ALPHA_OFF_BIT    (0x00000040)
 -#define CONVRULE_Z2H_NUM_ON_BIT       (0x00000080)
 -#define CONVRULE_Z2H_NUM_OFF_BIT      (0x00000100)
 +#define CONVRULE_CSS_ON_BIT           (0x00000008)
 +#define CONVRULE_Z2H_ON_BIT           (0x00000010)
 +#define CONVRULE_Z2H_OFF_BIT          (0x00000020)
++#define CONVRULE_Z2H_ALPHA_ON_BIT     (0x00000040)
++#define CONVRULE_Z2H_ALPHA_OFF_BIT    (0x00000080)
++#define CONVRULE_Z2H_NUM_ON_BIT       (0x00000100)
++#define CONVRULE_Z2H_NUM_OFF_BIT      (0x00000200)
  
  #define CONVRULE_ENGINE_ON_CMD        "EngineOn"
  #define CONVRULE_ENGINE_OFF_CMD       "EngineOff"
  #define CONVRULE_COOKIE_ON_CMD        "CookieOn"
  #define CONVRULE_COOKIE_OFF_CMD       "CookieOff"
 +#define CONVRULE_CSS_ON_CMD           "CssOn"
 +#define CONVRULE_CSS_OFF_CMD          "CssOff"
  #define CONVRULE_Z2H_ON_CMD           "Z2hOn"
  #define CONVRULE_Z2H_OFF_CMD          "Z2hOff"
+ #define CONVRULE_Z2H_ALPHA_ON_CMD     "Z2hAlphaOn"
+ #define CONVRULE_Z2H_ALPHA_OFF_CMD    "Z2hAlphaOff"
+ #define CONVRULE_Z2H_NUM_ON_CMD       "Z2hNumOn"
+ #define CONVRULE_Z2H_NUM_OFF_CMD      "Z2hNumOff"
+ #define CONVRULE_Z2H_ALL_ON_CMD       "Z2hAllOn"
+ #define CONVRULE_Z2H_ALL_OFF_CMD      "Z2hAllOff"
  
  
  #define CONVRULE_FLAG_NOTMATCH        (0x00000001)
diff --cc src/Makefile.am
index b3ecfd7,12f13bd..d8d9dee
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -39,16 -38,15 +39,17 @@@ libmod_chxj_la_SOURCES = mod_chxj.c 
      chxj_dbm.c \
      chxj_buffered_write.c \
      chxj_apache.c \
 -    chxj_add_device_env.c \
      chxj_serf.c \
-     chxj_conv_kana.c
 +    chxj_dump_string.c \
 +    chxj_css.c \
 +    chxj_add_device_env.c \
+     chxj_conv_z2h.c \
+     chxj_header_inf.c
  
  
 -libmod_chxj_la_CFLAGS = -O2 -prefer-pic @QDEFS@ @DDEFS@ -I. -I../include -I@with_apache_header@  -I./serf
 +libmod_chxj_la_CFLAGS = -O2 -prefer-pic @QDEFS@ @DDEFS@ -I. -I../include -I@with_apache_header@  -I./serf -I./css/include
  AM_CFLAGS = @CFLAGS@ -O2 -prefer-pic @QDEFS@ @DDEFS@ -I. -I../include -I@with_apache_header@
 -libmod_chxj_la_LIBADD = serf/.libs/libserf-0.a
 +libmod_chxj_la_LIBADD = serf/.libs/libserf-0.a css/src/.libs/libscss.a
  lib_LTLIBRARIES = libmod_chxj.la
  
  make_so:
diff --cc src/Makefile.in
index cae8b35,59217e8..81d1817
--- 1/src/Makefile.in
--- 2/src/Makefile.in
+++ b/src/Makefile.in
@@@ -79,10 -78,10 +79,11 @@@ am_libmod_chxj_la_OBJECTS = libmod_chxj
        libmod_chxj_la-chxj_cookie.lo libmod_chxj_la-chxj_mysql.lo \
        libmod_chxj_la-chxj_memcache.lo libmod_chxj_la-chxj_dbm.lo \
        libmod_chxj_la-chxj_buffered_write.lo \
 -      libmod_chxj_la-chxj_apache.lo \
 +      libmod_chxj_la-chxj_apache.lo libmod_chxj_la-chxj_serf.lo \
 +      libmod_chxj_la-chxj_dump_string.lo libmod_chxj_la-chxj_css.lo \
        libmod_chxj_la-chxj_add_device_env.lo \
-       libmod_chxj_la-chxj_conv_kana.lo
 -      libmod_chxj_la-chxj_serf.lo libmod_chxj_la-chxj_conv_z2h.lo \
++      libmod_chxj_la-chxj_conv_z2h.lo \
+       libmod_chxj_la-chxj_header_inf.lo
  libmod_chxj_la_OBJECTS = $(am_libmod_chxj_la_OBJECTS)
  libmod_chxj_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libmod_chxj_la_CFLAGS) \
@@@ -266,15 -264,14 +267,16 @@@ libmod_chxj_la_SOURCES = mod_chxj.c 
      chxj_dbm.c \
      chxj_buffered_write.c \
      chxj_apache.c \
 -    chxj_add_device_env.c \
      chxj_serf.c \
-     chxj_conv_kana.c
 +    chxj_dump_string.c \
 +    chxj_css.c \
 +    chxj_add_device_env.c \
+     chxj_conv_z2h.c \
+     chxj_header_inf.c
  
 -libmod_chxj_la_CFLAGS = -O2 -prefer-pic @QDEFS@ @DDEFS@ -I. -I../include -I@with_apache_header@  -I./serf
 +libmod_chxj_la_CFLAGS = -O2 -prefer-pic @QDEFS@ @DDEFS@ -I. -I../include -I@with_apache_header@  -I./serf -I./css/include
  AM_CFLAGS = @CFLAGS@ -O2 -prefer-pic @QDEFS@ @DDEFS@ -I. -I../include -I@with_apache_header@
 -libmod_chxj_la_LIBADD = serf/.libs/libserf-0.a
 +libmod_chxj_la_LIBADD = serf/.libs/libserf-0.a css/src/.libs/libscss.a
  lib_LTLIBRARIES = libmod_chxj.la
  all: all-am
  
@@@ -355,17 -352,15 +357,18 @@@ distclean-compile
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmod_chxj_la-chxj_chtml30.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmod_chxj_la-chxj_chtml40.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmod_chxj_la-chxj_chtml50.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmod_chxj_la-chxj_conv_kana.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmod_chxj_la-chxj_conv_z2h.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmod_chxj_la-chxj_cookie.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmod_chxj_la-chxj_css.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmod_chxj_la-chxj_dbm.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmod_chxj_la-chxj_dump.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmod_chxj_la-chxj_dump_string.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmod_chxj_la-chxj_encoding.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmod_chxj_la-chxj_hdml.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmod_chxj_la-chxj_header_inf.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmod_chxj_la-chxj_img_conv.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmod_chxj_la-chxj_img_conv_format.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmod_chxj_la-chxj_ixhtml10.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmod_chxj_la-chxj_jhtml.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmod_chxj_la-chxj_jxhtml.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmod_chxj_la-chxj_load_device_data.Plo@am__quote@
@@@ -691,33 -686,19 +694,40 @@@ libmod_chxj_la-chxj_serf.lo: chxj_serf.
  @AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmod_chxj_la_CFLAGS) $(CFLAGS) -c -o libmod_chxj_la-chxj_serf.lo `test -f 'chxj_serf.c' || echo '$(srcdir)/'`chxj_serf.c
  
- libmod_chxj_la-chxj_conv_kana.lo: chxj_conv_kana.c
- @am__fastdepCC_TRUE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmod_chxj_la_CFLAGS) $(CFLAGS) -MT libmod_chxj_la-chxj_conv_kana.lo -MD -MP -MF $(DEPDIR)/libmod_chxj_la-chxj_conv_kana.Tpo -c -o libmod_chxj_la-chxj_conv_kana.lo `test -f 'chxj_conv_kana.c' || echo '$(srcdir)/'`chxj_conv_kana.c
- @am__fastdepCC_TRUE@  mv -f $(DEPDIR)/libmod_chxj_la-chxj_conv_kana.Tpo $(DEPDIR)/libmod_chxj_la-chxj_conv_kana.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@     source='chxj_conv_kana.c' object='libmod_chxj_la-chxj_conv_kana.lo' libtool=yes @AMDEPBACKSLASH@
 +libmod_chxj_la-chxj_dump_string.lo: chxj_dump_string.c
 +@am__fastdepCC_TRUE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmod_chxj_la_CFLAGS) $(CFLAGS) -MT libmod_chxj_la-chxj_dump_string.lo -MD -MP -MF $(DEPDIR)/libmod_chxj_la-chxj_dump_string.Tpo -c -o libmod_chxj_la-chxj_dump_string.lo `test -f 'chxj_dump_string.c' || echo '$(srcdir)/'`chxj_dump_string.c
 +@am__fastdepCC_TRUE@  mv -f $(DEPDIR)/libmod_chxj_la-chxj_dump_string.Tpo $(DEPDIR)/libmod_chxj_la-chxj_dump_string.Plo
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     source='chxj_dump_string.c' object='libmod_chxj_la-chxj_dump_string.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmod_chxj_la_CFLAGS) $(CFLAGS) -c -o libmod_chxj_la-chxj_dump_string.lo `test -f 'chxj_dump_string.c' || echo '$(srcdir)/'`chxj_dump_string.c
 +
 +libmod_chxj_la-chxj_css.lo: chxj_css.c
 +@am__fastdepCC_TRUE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmod_chxj_la_CFLAGS) $(CFLAGS) -MT libmod_chxj_la-chxj_css.lo -MD -MP -MF $(DEPDIR)/libmod_chxj_la-chxj_css.Tpo -c -o libmod_chxj_la-chxj_css.lo `test -f 'chxj_css.c' || echo '$(srcdir)/'`chxj_css.c
 +@am__fastdepCC_TRUE@  mv -f $(DEPDIR)/libmod_chxj_la-chxj_css.Tpo $(DEPDIR)/libmod_chxj_la-chxj_css.Plo
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     source='chxj_css.c' object='libmod_chxj_la-chxj_css.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmod_chxj_la_CFLAGS) $(CFLAGS) -c -o libmod_chxj_la-chxj_css.lo `test -f 'chxj_css.c' || echo '$(srcdir)/'`chxj_css.c
 +
 +libmod_chxj_la-chxj_add_device_env.lo: chxj_add_device_env.c
 +@am__fastdepCC_TRUE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmod_chxj_la_CFLAGS) $(CFLAGS) -MT libmod_chxj_la-chxj_add_device_env.lo -MD -MP -MF $(DEPDIR)/libmod_chxj_la-chxj_add_device_env.Tpo -c -o libmod_chxj_la-chxj_add_device_env.lo `test -f 'chxj_add_device_env.c' || echo '$(srcdir)/'`chxj_add_device_env.c
 +@am__fastdepCC_TRUE@  mv -f $(DEPDIR)/libmod_chxj_la-chxj_add_device_env.Tpo $(DEPDIR)/libmod_chxj_la-chxj_add_device_env.Plo
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     source='chxj_add_device_env.c' object='libmod_chxj_la-chxj_add_device_env.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmod_chxj_la_CFLAGS) $(CFLAGS) -c -o libmod_chxj_la-chxj_add_device_env.lo `test -f 'chxj_add_device_env.c' || echo '$(srcdir)/'`chxj_add_device_env.c
 +
+ libmod_chxj_la-chxj_conv_z2h.lo: chxj_conv_z2h.c
+ @am__fastdepCC_TRUE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmod_chxj_la_CFLAGS) $(CFLAGS) -MT libmod_chxj_la-chxj_conv_z2h.lo -MD -MP -MF $(DEPDIR)/libmod_chxj_la-chxj_conv_z2h.Tpo -c -o libmod_chxj_la-chxj_conv_z2h.lo `test -f 'chxj_conv_z2h.c' || echo '$(srcdir)/'`chxj_conv_z2h.c
+ @am__fastdepCC_TRUE@  mv -f $(DEPDIR)/libmod_chxj_la-chxj_conv_z2h.Tpo $(DEPDIR)/libmod_chxj_la-chxj_conv_z2h.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@     source='chxj_conv_z2h.c' object='libmod_chxj_la-chxj_conv_z2h.lo' libtool=yes @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmod_chxj_la_CFLAGS) $(CFLAGS) -c -o libmod_chxj_la-chxj_conv_kana.lo `test -f 'chxj_conv_kana.c' || echo '$(srcdir)/'`chxj_conv_kana.c
+ @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmod_chxj_la_CFLAGS) $(CFLAGS) -c -o libmod_chxj_la-chxj_conv_z2h.lo `test -f 'chxj_conv_z2h.c' || echo '$(srcdir)/'`chxj_conv_z2h.c
+ 
+ libmod_chxj_la-chxj_header_inf.lo: chxj_header_inf.c
+ @am__fastdepCC_TRUE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmod_chxj_la_CFLAGS) $(CFLAGS) -MT libmod_chxj_la-chxj_header_inf.lo -MD -MP -MF $(DEPDIR)/libmod_chxj_la-chxj_header_inf.Tpo -c -o libmod_chxj_la-chxj_header_inf.lo `test -f 'chxj_header_inf.c' || echo '$(srcdir)/'`chxj_header_inf.c
+ @am__fastdepCC_TRUE@  mv -f $(DEPDIR)/libmod_chxj_la-chxj_header_inf.Tpo $(DEPDIR)/libmod_chxj_la-chxj_header_inf.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@     source='chxj_header_inf.c' object='libmod_chxj_la-chxj_header_inf.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmod_chxj_la_CFLAGS) $(CFLAGS) -c -o libmod_chxj_la-chxj_header_inf.lo `test -f 'chxj_header_inf.c' || echo '$(srcdir)/'`chxj_header_inf.c
  
  mostlyclean-libtool:
        -rm -f *.lo
diff --cc src/chxj_chtml10.c
Simple merge
diff --cc src/chxj_chtml20.c
index 8b50b70,3424c52..88ff008
--- 1/src/chxj_chtml20.c
--- 2/src/chxj_chtml20.c
+++ b/src/chxj_chtml20.c
@@@ -22,7 -22,7 +22,8 @@@
  #include "chxj_qr_code.h"
  #include "chxj_encoding.h"
  #include "chxj_buffered_write.h"
 +#include "chxj_css.h"
+ #include "chxj_header_inf.h"
  
  
  #define GET_CHTML20(X) ((chtml20_t*)(X))
diff --cc src/chxj_chtml30.c
Simple merge
diff --cc src/chxj_chtml40.c
Simple merge
diff --cc src/chxj_chtml50.c
Simple merge
diff --cc src/chxj_encoding.c
Simple merge
diff --cc src/chxj_jhtml.c
Simple merge
diff --cc src/chxj_jxhtml.c
Simple merge
diff --cc src/chxj_tag_util.c
Simple merge
diff --cc src/chxj_xhtml_mobile_1_0.c
Simple merge
diff --cc src/mod_chxj.c
Simple merge
mod_chxj
About OSDN
Find Software
Develop Software
Help