summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxi <xi@18f92427-320e-0410-9341-c67f048884a3>2006-08-20 09:34:59 +0000
committerxi <xi@18f92427-320e-0410-9341-c67f048884a3>2006-08-20 09:34:59 +0000
commitacbbf176ec3e1f9c8a1ad0279ee730d25c65cbf8 (patch)
tree28b0e048dc3b35ec2c2578f62fd075389cab6fbd
parent70f429bea41c6beedd4c4b902d747263e919bb0c (diff)
downloadpyyaml-acbbf176ec3e1f9c8a1ad0279ee730d25c65cbf8.tar.gz
Fix makefile and add setup.cfg.
git-svn-id: http://svn.pyyaml.org/pyyaml/trunk@229 18f92427-320e-0410-9341-c67f048884a3
-rw-r--r--Makefile7
-rw-r--r--setup.cfg17
2 files changed, 20 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index d653093..a0d4ebd 100644
--- a/Makefile
+++ b/Makefile
@@ -9,19 +9,19 @@ build:
${PYTHON} setup.py build ${PARAMETERS}
buildext:
- ${PYTHON} setup_ext.py build ${PARAMETERS}
+ ${PYTHON} setup_with_libyaml.py build ${PARAMETERS}
force:
${PYTHON} setup.py build -f ${PARAMETERS}
forceext:
- ${PYTHON} setup_ext.py build -f ${PARAMETERS}
+ ${PYTHON} setup_with_libyaml.py build -f ${PARAMETERS}
install: build
${PYTHON} setup.py install ${PARAMETERS}
installext: buildext
- ${PYTHON} setup_ext.py install ${PARAMETERS}
+ ${PYTHON} setup_with_libyaml.py install ${PARAMETERS}
test: build
${PYTHON} tests/test_build.py ${TEST}
@@ -37,4 +37,3 @@ windist:
clean:
${PYTHON} setup.py clean -a
-
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..75d6ea1
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,17 @@
+
+# The INCLUDE and LIB directories to build the '_yaml' extension.
+# You may also set them using the options '-I' and '-L'.
+[build_ext]
+
+# List of directories to search for 'yaml.h' (separated by ':').
+#include_dirs=/usr/local/include:../../include
+
+# List of directories to search for 'libyaml.a' (separated by ':').
+#library_dirs=/usr/local/lib:../../lib
+
+
+# An alternative compiler to build the extention.
+#compiler=mingw32
+
+# Additional preprocessor definitions might be required.
+#define=YAML_DECLARE_STATIC