X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=148a8aa43bbe71e42347706512d1f6dc1f7ad795;hb=b7593d9531a46312c686b0e4e20a5d8d6e7e7647;hp=af50fcbde23911c2ca48a52e295bf5f33cabe814;hpb=a22283104e3671eaddb8823b7d1f585a0721b888;p=plewww.git diff --git a/Makefile b/Makefile index af50fcb..148a8aa 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ SSHCOMMAND:=ssh root@$(PLC) endif LOCAL_RSYNC_EXCLUDES := --exclude '*.pyc' -RSYNC_EXCLUDES := --exclude .svn --exclude CVS --exclude '*~' --exclude TAGS $(LOCAL_RSYNC_EXCLUDES) +RSYNC_EXCLUDES := --exclude .svn --exclude .git --exclude '*~' --exclude TAGS $(LOCAL_RSYNC_EXCLUDES) RSYNC_COND_DRY_RUN := $(if $(findstring n,$(MAKEFLAGS)),--dry-run,) RSYNC := rsync -a -v $(RSYNC_COND_DRY_RUN) $(RSYNC_EXCLUDES) @@ -39,7 +39,7 @@ endif compress: $(foreach file,\ - $(shell find . -type f -iname "*.js" | grep -v datepicker.js),\ + $(shell find . -type f -iname "*.js" | grep -v datepicker.js | grep -v raphael),\ $(shell python jsmin.py < $(file) > $(file).new && mv $(file).new $(file))) @echo "Compressed .js files with jsmin.py"