cleanup

diff --git a/Makefile b/Makefile
index 8ac9a4c..cb0cacd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,10 +17,10 @@ PYTHON       = $(BASEDIR)/$(PYTHON_DIR)/bin/python
 EASY_INSTALL = $(BASEDIR)/$(PYTHON_DIR)/bin/easy_install
 PASTER       = $(BASEDIR)/$(PYTHON_DIR)/bin/paster
 
-default: update
+default: update-nonet
 
 .PHONY: python-unpack python-build python setuptools eggs pil-unpack pil-build pil buildout \
-       bootstrap update update-nonet shell init
+       bootstrap update update-nonet shell init userinit
 
 python-unpack: $(PYTHON_DIR)/Python-$(PYTHON_VERSION)/README
 $(PYTHON_DIR)/Python-$(PYTHON_VERSION)/README:
@@ -79,12 +79,6 @@ bootstrap:
        @echo "/.installed.cfg" >>.gitignore
        @echo "*.pyc" >>.gitignore
 
-update:
-       bin/buildout
-
-update-nonet:
-       bin/buildout -No
-
 shell:
        @PATH=$(BASEDIR)/$(PYTHON_DIR)/bin:$(BASEDIR)/bin:$$PATH $$SHELL
 
@@ -92,10 +86,17 @@ init: python setuptools pil eggs buildout bootstrap userinit update .gitignore
 
 userinit::
 
+update::
+       bin/buildout
+
+update-nonet::
+       bin/buildout -No
+
 ###########################################################################
 
-userinit:: easyshop/README.txt
+easyshop-svn: easyshop/README.txt
 easyshop/README.txt:
        svn co $(EASYSHOP_URL) easyshop
 
-.PHONY: easyshop
+.PHONY: easyshop-svn
+userinit:: easyshop-svn

diff --git a/easyshop.cfg b/easyshop.cfg
index b9ef4d5..e014ba7 100644 (file)
--- a/easyshop.cfg
+++ b/easyshop.cfg
@@ -1,14 +1,13 @@
 [easyshop]
 
-eggs = 
-    elementtree
+zcml =
     easyshop.core
     easyshop.carts
     easyshop.catalog
     easyshop.checkout
     easyshop.criteria
     easyshop.customers    
-    easyshop.discounts        
+    easyshop.discounts
     easyshop.groups
     easyshop.information
     easyshop.kss  
@@ -21,6 +20,10 @@ eggs =
     easyshop.stocks
     easyshop.taxes
 
+eggs = 
+    elementtree
+    ${easyshop:zcml}
+
 develop = 
     easyshop/src/easyshop.core
     easyshop/src/easyshop.carts
@@ -41,26 +44,6 @@ develop =
     easyshop/src/easyshop.stocks
     easyshop/src/easyshop.taxes
 
-zcml =
-    easyshop.core
-    easyshop.carts
-    easyshop.catalog
-    easyshop.checkout
-    easyshop.criteria
-    easyshop.customers    
-    easyshop.discounts
-    easyshop.groups
-    easyshop.information
-    easyshop.kss  
-    easyshop.login
-    easyshop.management
-    easyshop.order      
-    easyshop.payment    
-    easyshop.shipping      
-    easyshop.shop
-    easyshop.stocks
-    easyshop.taxes
-
 products =
     easyshop/products