summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxi <xi@18f92427-320e-0410-9341-c67f048884a3>2008-12-27 23:17:57 +0000
committerxi <xi@18f92427-320e-0410-9341-c67f048884a3>2008-12-27 23:17:57 +0000
commitec1576b3c65cb2c43c82beaccd6109909758030f (patch)
tree9d86c3ef451599a97bb7562b2de7d3481f4c11f3
parent4a42658042c8c36804fa90fc9337f18d6832d520 (diff)
downloadlibyaml-0.1.2.tar.gz
Merged the win32 packaging fix.0.1.2
git-svn-id: http://svn.pyyaml.org/libyaml/tags/0.1.2@321 18f92427-320e-0410-9341-c67f048884a3
-rw-r--r--Makefile.am4
-rw-r--r--configure.ac2
-rw-r--r--win32/Makefile.am24
3 files changed, 27 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index 1cf4114..7835b61 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
## Run `./bootstrap` to generate the "Makefile.in" files in this directory and
-## the "$SUBDIR" subdirectories.
+## the "$SUBDIRS" subdirectories.
-SUBDIRS = include src . tests
+SUBDIRS = include src . tests win32
EXTRA_DIST = README LICENSE doc/doxygen.cfg
diff --git a/configure.ac b/configure.ac
index f494c1a..32bc8dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,7 +67,7 @@ AC_C_CONST
AC_TYPE_SIZE_T
# Define Makefiles.
-AC_CONFIG_FILES([include/Makefile src/Makefile Makefile tests/Makefile])
+AC_CONFIG_FILES([include/Makefile src/Makefile Makefile tests/Makefile win32/Makefile])
# Generate the "configure" script.
AC_OUTPUT
diff --git a/win32/Makefile.am b/win32/Makefile.am
new file mode 100644
index 0000000..d225c3e
--- /dev/null
+++ b/win32/Makefile.am
@@ -0,0 +1,24 @@
+
+VC6_FILES = vc6/libyaml.dsw vc6/yaml.dsp vc6/yamldll.dsp \
+ vc6/test_version.dsp vc6/test_reader.dsp \
+ vc6/run_scanner.dsp vc6/run_parser.dsp \
+ vc6/run_loader.dsp vc6/run_emitter.dsp vc6/run_dumper.dsp \
+ vc6/example_reformatter.dsp vc6/example_reformatter_alt.dsp \
+ vc6/example_deconstructor.dsp vc6/example_deconstructor_alt.dsp
+
+VS2003_FILES = vs2003/libyaml.sln vs2003/yaml.vcproj vs2003/yamldll.vcproj \
+ vs2003/test_version.vcproj vs2003/test_reader.vcproj \
+ vs2003/run_scanner.vcproj vs2003/run_parser.vcproj \
+ vs2003/run_loader.vcproj vs2003/run_emitter.vcproj vs2003/run_dumper.vcproj \
+ vs2003/example_reformatter.vcproj vs2003/example_reformatter_alt.vcproj \
+ vs2003/example_deconstructor.vcproj vs2003/example_deconstructor_alt.vcproj
+
+VS2008_FILES = vs2008/libyaml.sln vs2008/yaml.vcproj vs2008/yamldll.vcproj \
+ vs2008/test_version.vcproj vs2008/test_reader.vcproj \
+ vs2008/run_scanner.vcproj vs2008/run_parser.vcproj \
+ vs2008/run_loader.vcproj vs2008/run_emitter.vcproj vs2008/run_dumper.vcproj \
+ vs2008/example_reformatter.vcproj vs2008/example_reformatter_alt.vcproj \
+ vs2008/example_deconstructor.vcproj vs2008/example_deconstructor_alt.vcproj
+
+EXTRA_DIST = config.h $(VC6_FILES) $(VS2003_FILES) $(VS2008_FILES)
+