Permalink
Browse files

Change how the third_party Makefile stuff works.

  • Loading branch information...
1 parent 62b175e commit 9ab2261ac378bf31bdd6a871267cc4f925ef8bf3 @mithro mithro committed Feb 25, 2012
Showing with 8 additions and 15 deletions.
  1. +4 −9 Makefile
  2. +4 −6 third_party/Makefile
View
13 Makefile
@@ -40,19 +40,14 @@ lib/python2.6/site-packages/distribute-0.6.24-py2.6.egg-info: lib
lib/python2.6/site-packages/ez_setup.py: lib
$(ACTIVATE) && pip install ez_setup
-third_party/.initialized:
- git submodule init
- touch third_party/.initialized
-
-third_party/.updated: .gitmodules third_party/.initialized
- git submodule update
- touch -r .gitmodules third_party/.updated
+third_party:
+ cd third_party && make
src/pip-delete-this-directory.txt: requirements.txt
$(ACTIVATE) && pip install -E . -r requirements.txt
touch -r requirements.txt src/pip-delete-this-directory.txt
-install: lib/python2.6/site-packages/ez_setup.py lib/python2.6/site-packages/distribute-0.6.24-py2.6.egg-info third_party/.initialized third_party/.updated src/pip-delete-this-directory.txt
+install: lib/python2.6/site-packages/ez_setup.py lib/python2.6/site-packages/distribute-0.6.24-py2.6.egg-info third_party src/pip-delete-this-directory.txt
prepare-serve: install
$(ACTIVATE) && python manage.py collectstatic --noinput
@@ -98,4 +93,4 @@ private:
rm -rf private
git clone git+ssh://git@github.com/mithro/slug-private.git private
-.PHONY : lint upload deploy serve clean config edit private prepare-serve
+.PHONY : lint upload deploy serve clean config edit private prepare-serve third_party
View
10 third_party/Makefile
@@ -1,18 +1,16 @@
#!/bin/bash
-all: git
+all: .updated
clean: git_clean
###############################################################################
# third_party modules are managed by git
###############################################################################
-git:
+.updated: ../.gitmodules
@cd ..; echo "Updating git submodules." ;\
git submodule init; \
git submodule update
+ touch -r ../.gitmodules .updated
-git_clean:
-
-
-.PHONY : all clean git git_clean
+.PHONY : all clean git

0 comments on commit 9ab2261

Please sign in to comment.