X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=Makefile;h=2d344c6a58375a790bdce1bc9a12b3fb3c0f3882;hb=434b87b8a233eb24ec773de801f3adb460fbd0f4;hp=0f8187b3b4288679f623f97c0e3bc2ab0c348d3d;hpb=1fc7dcff11827a2abd3516c941b56d0b2b46f078;p=jquery.git

diff --git a/Makefile b/Makefile
index 0f8187b..2d344c6 100644
--- a/Makefile
+++ b/Makefile
@@ -9,11 +9,14 @@ SPEED_DIR = ${PREFIX}/speed
 PLUG_DIR = ../plugins
 
 BASE_FILES = ${SRC_DIR}/core.js\
+	${SRC_DIR}/data.js\
+	${SRC_DIR}/support.js\
 	${SRC_DIR}/selector.js\
 	${SRC_DIR}/event.js\
 	${SRC_DIR}/ajax.js\
 	${SRC_DIR}/fx.js\
-	${SRC_DIR}/offset.js
+	${SRC_DIR}/offset.js\
+	${SRC_DIR}/dimensions.js
 
 PLUGINS = ${PLUG_DIR}/button/*\
 	${PLUG_DIR}/center/*\
@@ -47,6 +50,7 @@ JQ_VER = `cat version.txt`
 VER = sed s/@VERSION/${JQ_VER}/
 
 JAR = java -jar ${BUILD_DIR}/js.jar
+MINJAR = java -jar ${BUILD_DIR}/yuicompressor-2.4.2.jar
 
 all: jquery lite min pack speed
 	@@echo "jQuery build complete."
@@ -101,7 +105,7 @@ ${JQ_MIN}: ${JQ}
 	@@echo "Building" ${JQ_MIN}
 
 	@@echo " - Compressing using Minifier"
-	@@${JAR} ${BUILD_DIR}/build/min.js ${JQ} ${JQ_MIN}
+	@@${MINJAR} ${JQ} > ${JQ_MIN}
 
 	@@echo ${JQ_MIN} "Built"
 	@@echo
@@ -150,7 +154,7 @@ speed: ${JQ}
 	@@cp -f ${BUILD_DIR}/speed/index.html ${SPEED_DIR}
 	@@cp -f ${BUILD_DIR}/speed/benchmarker.css ${SPEED_DIR}
 	@@cp -f ${BUILD_DIR}/speed/benchmarker.js ${SPEED_DIR}
-	@@cp -f ${BUILD_DIR}/speed/jquery-1.1.2.js ${SPEED_DIR}
+	@@cp -f ${BUILD_DIR}/speed/jquery-basis.js ${SPEED_DIR}
 
 	@@echo "Speed Test Suite Built"
 	@@echo