Permalink
Browse files

Update and move sequence submodule. Slim Makefile

  • Loading branch information...
1 parent 7bf49fa commit 6bbf24a8429ade31db2b26e1d0a0ed69f38ff5d3 @jbuck jbuck committed Sep 26, 2011
Showing with 9 additions and 18 deletions.
  1. +4 −3 .gitmodules
  2. +4 −14 Makefile
  3. +1 −0 modules/sequence
  4. +0 −1 players/sequence
View
@@ -1,3 +1,4 @@
-[submodule "players/sequence"]
- path = players/sequence
- url = git://github.com/rwldrn/popcorn.sequence.git
+
+[submodule "modules/sequence"]
+ path = modules/sequence
+ url = https://github.com/rwldrn/popcorn.sequence.git
View
@@ -123,7 +123,7 @@ ${POPCORN_MIN}: ${POPCORN_DIST}
@@$(call add_license, $(POPCORN_MIN))
@@$(call add_version, $(POPCORN_MIN))
-${POPCORN_COMPLETE_MIN}: update ${POPCORN_SRC} ${MODULES_SRC} ${PLUGINS_SRC} ${PARSERS_SRC} $(EFFECTS_SRC) ${DIST_DIR}
+${POPCORN_COMPLETE_MIN}: setup ${POPCORN_SRC} ${MODULES_SRC} ${PLUGINS_SRC} ${PARSERS_SRC} $(EFFECTS_SRC) ${DIST_DIR}
@@echo "Building" ${POPCORN_COMPLETE_MIN}
@@$(call compile, $(POPCORN_COMPLETE_LIST), $(POPCORN_COMPLETE_MIN))
@@$(call add_license, $(POPCORN_COMPLETE_MIN))
@@ -179,7 +179,7 @@ $(EFFECTS_DIST): $(EFFECTS_SRC) $(DIST_DIR)
@@echo "Building $(EFFECTS_DIST)"
@@cat $(EFFECTS_SRC) > $(EFFECTS_DIST)
-complete: update ${POPCORN_SRC} ${MODULES_SRC} ${PARSERS_SRC} ${PLUGINS_SRC} ${PLAYERS_SRC} $(EFFECTS_SRC) ${DIST_DIR}
+complete: setup ${POPCORN_SRC} ${MODULES_SRC} ${PARSERS_SRC} ${PLUGINS_SRC} ${PLAYERS_SRC} $(EFFECTS_SRC) ${DIST_DIR}
@@echo "Building popcorn + modules + plugins + parsers + players + effects..."
@@cat ${POPCORN_SRC} ${MODULES_SRC} ${PLUGINS_SRC} ${PARSERS_SRC} ${PLAYERS_SRC} $(EFFECTS_SRC) > $(POPCORN_COMPLETE_DIST)
@@$(call add_license, $(POPCORN_COMPLETE_DIST))
@@ -264,16 +264,6 @@ clean:
@@echo "Removing Distribution directory:" ${DIST_DIR}
@@rm -rf ${DIST_DIR}
-# Setup any git submodules we need
-SEQUENCE_SRC = ${PLAYERS_DIR}/sequence/popcorn.sequence.js
-
-setup: ${SEQUENCE_SRC} update
-
-update:
+setup:
@@echo "Updating submodules..."
- @@git submodule update
- @@cd players/sequence; git pull origin master
-
-${SEQUENCE_SRC}:
- @@echo "Setting-up submodules..."
- @@git submodule init
+ @@git submodule update --init
Submodule sequence added at 45ec9d
Submodule sequence deleted from 01eb7d

0 comments on commit 6bbf24a

Please sign in to comment.