compiler hashtable.c and pinyin.c directly, do not use static library

duguying · Jan 29, 2014 · adf7dfa · adf7dfa
1 parent 06a57bd
commit adf7dfa
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 31 deletions.
diff --git a/config.m4 b/config.m4
@@ -1,16 +1,19 @@
 PHP_ARG_WITH(pinyin, for pinyin support,
 [  --with-pinyin             Include pinyin support])
 
-cd ./pinyin/
-make
-cd ..
+dnl cd ./pinyin/
+dnl make
+dnl cd ..
 
 PHP_ADD_INCLUDE(pinyin)
 
-PHP_ADD_LIBPATH(pinyin, PINYIN_SHARED_LIBADD)
-PHP_ADD_LIBRARY(pinyin,pinyin, PINYIN_SHARED_LIBADD)
-PHP_SUBST(PINYIN_SHARED_LIBADD)
+dnl PHP_ADD_LIBPATH(pinyin, PINYIN_SHARED_LIBADD)
+dnl PHP_ADD_LIBRARY(pinyin,pinyin, PINYIN_SHARED_LIBADD)
+dnl PHP_SUBST(PINYIN_SHARED_LIBADD)
 
-if test "$PHP_PINYIN" != "no"; then
-  PHP_NEW_EXTENSION(pinyin, pinyin.c ,$ext_shared)
-fi
+dnl if test "$PHP_PINYIN" != "no"; then
+  PHP_NEW_EXTENSION(pinyin, pinyin.c \
+							pinyin/hashtable.c \
+							pinyin/pinyin.c \
+					,$ext_shared)
+dnl fi
diff --git a/pinyin/CMakeLists.txt b/pinyin/CMakeLists.txt
diff --git a/pinyin/Makefile b/pinyin/Makefile