* version up.

[modchxj/mod_chxj.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index a3f5136..dbf0705 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,7 +24,7 @@ libmod_chxj_la_SOURCES = mod_chxj.c \
     chxj_str_util.c  \
     chxj_img_conv.c  \
     chxj_dump.c \
-       chxj_img_conv_format.c \
+    chxj_img_conv_format.c \
     chxj_qr_code.c \
     chxj_calc_ecc.c \
     chxj_apply_convrule.c \
@@ -32,38 +32,39 @@ libmod_chxj_la_SOURCES = mod_chxj.c \
     chxj_node_convert.c \
     chxj_url_encode.c \
     chxj_preg_replace.c \
-<<<<<<< HEAD:src/Makefile.am
-    chxj_emoji.c \
-    chxj_jreserved_tag.c \
-=======
->>>>>>>   * updated new trunk.:src/Makefile.am
     chxj_cookie.c \
     chxj_mysql.c \
     chxj_memcache.c \
     chxj_dbm.c \
     chxj_buffered_write.c \
-    chxj_apache.c
+    chxj_apache.c \
+    chxj_add_device_env.c \
+    chxj_serf.c \
+    chxj_conv_z2h.c \
+    chxj_header_inf.c \
+    chxj_jreserved_tag.c
 
 
-libmod_chxj_la_CFLAGS = -O2 -prefer-pic @QDEFS@ @DDEFS@ -I. -I../include -I@with_apache_header@ 
+libmod_chxj_la_CFLAGS = -O2 -prefer-pic @QDEFS@ @DDEFS@ -I. -I../include -I@with_apache_header@  -I./serf
 AM_CFLAGS = @CFLAGS@ -O2 -prefer-pic @QDEFS@ @DDEFS@ -I. -I../include -I@with_apache_header@
-
+libmod_chxj_la_LIBADD = serf/.libs/libserf-0.a
 lib_LTLIBRARIES = libmod_chxj.la
 
 make_so:
        @if test ! -L mod_chxj.so ; then ln -s .libs/libmod_chxj.so mod_chxj.so ; fi
 
+serf/.libs/libserf-0.a:
+       (cd serf; CFLAGS=-fPIC CXXFLAGS=-fPIC ./configure --enable-shared --with-apr=`dirname @APR_CONFIG@` --with-apr-util=`dirname @APU_CONFIG@` @OPENSSL_PATH@; make)
+
 clean:
        rm -fr .libs
        rm -f *.o *.lo *.la
        rm -f mod_chxj.so
+       rm -f serf/libserf-0.la
+       (cd serf; make clean)
 
 install: make_so
-<<<<<<< HEAD:src/Makefile.am
-       @@APXS@ -i -n "chxj" @PACKAGE_NAME@.so
-=======
        @@APXS@ -i -n "chxj" @PACKAGE_NAME@.so 
->>>>>>>   * updated new trunk.:src/Makefile.am
 
 activate: make_so
        @@APXS@ -i -a -n "chxj" @PACKAGE_NAME@.so