Improving cleanliness.

o Some files in the demo/ directory were committed and should not have
  been.  These are removed.
o Cleaning includes removing demo/ directory transients.
o Debian rules explicitly perform demo/ cleanup so that source tarball
  is correct.
o Resolves #329
This commit is contained in:
Marc Singer 2015-07-24 08:23:32 -07:00
parent f8f937608c
commit 655d0a3b0d
6 changed files with 25 additions and 2 deletions

3
.gitignore vendored
View file

@ -24,7 +24,10 @@ debian/*.debhelper
debian/*.substvars debian/*.substvars
debian/shellinabox/ debian/shellinabox/
debian/tmp/ debian/tmp/
demo/beep.wav
demo/demo.js demo/demo.js
demo/enabled.gif
demo/favicon.ico
demo/keyboard.png demo/keyboard.png
demo/print-styles.css demo/print-styles.css
demo/styles.css demo/styles.css

View file

@ -238,7 +238,7 @@ shellinaboxd.1: ${top_srcdir}/shellinabox/shellinaboxd.man.in \
@out=`echo "$@" 2>/dev/null|sed -e 's/\.[^.]*$$/.ps/'`; \ @out=`echo "$@" 2>/dev/null|sed -e 's/\.[^.]*$$/.ps/'`; \
man -Tps "./$@" >"$${out}" 2>/dev/null || rm -f "$${out}" man -Tps "./$@" >"$${out}" 2>/dev/null || rm -f "$${out}"
clean-local: clean-local: clean-demo
-rm -rf shellinaboxd.1 \ -rm -rf shellinaboxd.1 \
shellinaboxd.ps shellinaboxd.ps
-rm -rf debian/shellinabox \ -rm -rf debian/shellinabox \
@ -259,6 +259,20 @@ clean-local:
shellinabox/vt100.js \ shellinabox/vt100.js \
shellinabox/vt100.h shellinabox/vt100.h
clean-demo:
-rm demo/beep.wav \
demo/demo.js \
demo/enabled.gif \
demo/favicon.ico \
demo/keyboard.png \
demo/print-styles.css \
demo/styles.css \
demo/usercss-0.css \
demo/usercss-1.css \
demo/usercss-2.css \
demo/usercss-3.css \
demo/vt100.js
.css.h: .css.h:
@echo od "$<" '>'"$@" @echo od "$<" '>'"$@"
@mkdir -p "`dirname "$@"`" @mkdir -p "`dirname "$@"`"

8
debian/rules vendored
View file

@ -4,8 +4,14 @@
# Uncomment this to turn on verbose mode. # Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1 #export DH_VERBOSE=1
DH_WITH=--with autotools-dev,autoreconf
clean:
[ ! -f Makefile ] || make clean-demo
dh clean $(DH_WITH)
%: %:
dh $@ --with autotools-dev,autoreconf dh $@ $(DH_WITH)
# elf-2012.04.10: Since Debian manages package dependencies we can # elf-2012.04.10: Since Debian manages package dependencies we can
# force linkage of ssl s.t. the dependency is properly kept # force linkage of ssl s.t. the dependency is properly kept

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 847 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB