X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=Makefile;h=4ec8ad6286b8551b0f2947c222924bcadfa1588a;hb=297a450e05e80e930d53631bb9ae2c3fe09378b7;hp=b0351cc33658f5b931ee6970e6aa0f59bf61691f;hpb=78ed830b9bd48e2fd5349854d40c4bef0d907caa;p=jquery.git

diff --git a/Makefile b/Makefile
index b0351cc..4ec8ad6 100644
--- a/Makefile
+++ b/Makefile
@@ -7,10 +7,11 @@ TEST_DIR = ${PREFIX}/test
 DIST_DIR = ${PREFIX}/dist
 PLUG_DIR = ../plugins
 
-BASE_FILES = ${SRC_DIR}/jquery/*\
-	${SRC_DIR}/event/*\
-	${SRC_DIR}/fx/*\
-	${SRC_DIR}/ajax/*
+BASE_FILES = ${SRC_DIR}/jquery/jquery.js\
+	${SRC_DIR}/selector/selector.js\
+	${SRC_DIR}/event/event.js\
+	${SRC_DIR}/ajax/ajax.js\
+	${SRC_DIR}/fx/fx.js
 
 PLUGINS = ${PLUG_DIR}/button/*\
 	${PLUG_DIR}/center/*\
@@ -22,7 +23,9 @@ PLUGINS = ${PLUG_DIR}/button/*\
 	${PLUG_DIR}/interface/*\
 	${PLUG_DIR}/pager/*\
 	${PLUG_DIR}/tablesorter/*\
-	${PLUG_DIR}/tabs/*
+	${PLUG_DIR}/tabs/*\
+	${PLUG_DIR}/tooltip/jquery.tooltip.js\
+	${PLUG_DIR}/accordion/jquery.accordion.js
 
 MODULES = ${SRC_DIR}/intro.js\
 	${BASE_FILES}\
@@ -35,6 +38,7 @@ MODULES_WITH_PLUGINS = ${SRC_DIR}/intro.js\
 
 JQ = ${DIST_DIR}/jquery.js
 JQ_LITE = ${DIST_DIR}/jquery.lite.js
+JQ_MIN = ${DIST_DIR}/jquery.min.js
 JQ_PACK = ${DIST_DIR}/jquery.pack.js
 
 JQ_VER = `cat version.txt`
@@ -90,6 +94,17 @@ ${JQ_PACK}: ${JQ}
 	@@echo ${JQ_PACK} "Built"
 	@@echo
 
+min: ${JQ_MIN}
+
+${JQ_MIN}: ${JQ}
+	@@echo "Building" ${JQ_MIN}
+
+	@@echo " - Compressing using Minifier"
+	@@${JAR} ${BUILD_DIR}/build/min.js ${JQ} ${JQ_MIN}
+
+	@@echo ${JQ_MIN} "Built"
+	@@echo
+
 test: ${JQ}
 	@@echo "Building Test Suite"
 
@@ -102,6 +117,8 @@ test: ${JQ}
 	@@echo " - Copying over script files."
 	@@cp -fR ${BUILD_DIR}/test/data ${TEST_DIR}/data
 	@@cp -f ${BUILD_DIR}/test/index.html ${TEST_DIR}
+	@@cp -f ${BUILD_DIR}/test/fx.html ${TEST_DIR}
+	@@cp -f ${BUILD_DIR}/test/cow.jpg ${TEST_DIR}
 
 	@@echo " - Compiling Test Cases"
 	@@${JAR} ${BUILD_DIR}/test/test.js ${JQ} ${TEST_DIR}