Tried to fix make build, PLEASE TEST

diff --git a/Makefile b/Makefile
index b0351cc33658f5b931ee6970e6aa0f59bf61691f..9fcdd808af7f744bc929a9de77f226102cd3fa71 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,10 +7,10 @@ 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}/event/event.js\
+       ${SRC_DIR}/fx/fx.js\
+       ${SRC_DIR}/ajax/ajax.js
 
 PLUGINS = ${PLUG_DIR}/button/*\
        ${PLUG_DIR}/center/*\
@@ -22,7 +22,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}\

diff --git a/build.xml b/build.xml
index 7424dbf41b903a4930543924b219276da33ffe4a..e2a415a93e5e23d153597a1c3dde44d4589b3ced 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -25,7 +25,7 @@
        <property description="Dir to look for plugins" name="PLUGIN_DIR" location="../plugins" />\r
        <property description="Add single plugins here" name="PLUGINS" value="none" />
        <property description="Add all plugins here" name="PLUGINS_ALL" 
-               value="button/*.js,center/*.js,cookie/*.js,form/*.js,greybox/*.js,interface/*.js,pager/*.js,tablesorter/*.js,tabs/*.js,tooltip/*.js,accordion/*.jw" />\r
+               value="button/*.js,center/*.js,cookie/*.js,form/*.js,greybox/*.js,interface/*.js,pager/*.js,tablesorter/*.js,tabs/*.js,tooltip/*.js,accordion/*.js" />\r
 
        <property description="Target parent folder for built files" name="PREFIX" value="." />
        <property description="Folder for docs target" name="DOCS_DIR" value="${PREFIX}/docs" />