Index: /pyyaml/trunk/MANIFEST.in
===================================================================
--- /pyyaml/trunk/MANIFEST.in	(revision 165)
+++ /pyyaml/trunk/MANIFEST.in	(revision 227)
@@ -1,2 +1,3 @@
-include README LICENSE
+include README LICENSE setup.py setup_with_libyaml.py
+include ext/_yaml.pyx ext/_yaml.pxd ext/_yaml.h ext/_yaml.c
 recursive-include examples *.py *.cfg
Index: /pyyaml/trunk/setup_with_libyaml.py
===================================================================
--- /pyyaml/trunk/setup_with_libyaml.py	(revision 227)
+++ /pyyaml/trunk/setup_with_libyaml.py	(revision 227)
@@ -0,0 +1,31 @@
+
+from setup import *
+
+from distutils.core import setup
+from distutils.extension import Extension
+from Pyrex.Distutils import build_ext
+
+if __name__ == '__main__':
+
+    setup(
+        name=NAME,
+        version=VERSION,
+        description=DESCRIPTION,
+        long_description=LONG_DESCRIPTION,
+        author=AUTHOR,
+        author_email=AUTHOR_EMAIL,
+        license=LICENSE,
+        platforms=PLATFORMS,
+        url=URL,
+        download_url=DOWNLOAD_URL,
+        classifiers=CLASSIFIERS,
+
+        package_dir={'': 'lib'},
+        packages=['yaml'],
+        ext_modules=[
+            Extension("_yaml", ["ext/_yaml.pyx"], libraries=['yaml']),
+        ],
+
+        cmdclass = {'build_ext': build_ext}
+    )
+
Index: /pyyaml/trunk/setup.py
===================================================================
--- /pyyaml/trunk/setup.py	(revision 192)
+++ /pyyaml/trunk/setup.py	(revision 227)
@@ -1,5 +1,5 @@
 
 NAME = 'PyYAML'
-VERSION = '3.03'
+VERSION = '3.04'
 DESCRIPTION = "YAML parser and emitter for Python"
 LONG_DESCRIPTION = """\
@@ -31,22 +31,23 @@
 ]
 
-
 from distutils.core import setup
 
-setup(
-    name=NAME,
-    version=VERSION,
-    description=DESCRIPTION,
-    long_description=LONG_DESCRIPTION,
-    author=AUTHOR,
-    author_email=AUTHOR_EMAIL,
-    license=LICENSE,
-    platforms=PLATFORMS,
-    url=URL,
-    download_url=DOWNLOAD_URL,
-    classifiers=CLASSIFIERS,
+if __name__ == '__main__':
 
-    package_dir={'': 'lib'},
-    packages=['yaml'],
-)
+    setup(
+        name=NAME,
+        version=VERSION,
+        description=DESCRIPTION,
+        long_description=LONG_DESCRIPTION,
+        author=AUTHOR,
+        author_email=AUTHOR_EMAIL,
+        license=LICENSE,
+        platforms=PLATFORMS,
+        url=URL,
+        download_url=DOWNLOAD_URL,
+        classifiers=CLASSIFIERS,
 
+        package_dir={'': 'lib'},
+        packages=['yaml'],
+    )
+
Index: yaml/trunk/setup_ext.py
===================================================================
--- /pyyaml/trunk/setup_ext.py	(revision 195)
+++ 	(revision )
@@ -1,13 +1,0 @@
-
-from distutils.core import setup
-from distutils.extension import Extension
-from Pyrex.Distutils import build_ext
-
-setup(
-    name = '_yaml',
-    ext_modules=[
-        Extension("_yaml", ["ext/_yaml.pyx"], libraries=['yaml']),
-    ],
-    cmdclass = {'build_ext': build_ext}
-)
-