Another attempt at coming up with Makefile rules that work for
both Linux and BSD. git-svn-id: https://shellinabox.googlecode.com/svn/trunk@210 0da03de8-d603-11dd-86c2-0f8696b7b6f9
This commit is contained in:
parent
a5c8e032b7
commit
445d3c66a6
8 changed files with 26 additions and 26 deletions
20
Makefile.am
20
Makefile.am
|
@ -158,43 +158,43 @@ ${top_srcdir}/demo/demo.js: ${top_srcdir}/demo/beep.wav \
|
|||
|
||||
${top_srcdir}/demo/beep.wav: ${top_srcdir}/shellinabox/beep.wav
|
||||
@rm -f "$@"
|
||||
ln "$^" "$@"
|
||||
ln "$?" "$@"
|
||||
|
||||
${top_srcdir}/demo/enabled.gif: ${top_srcdir}/shellinabox/enabled.gif
|
||||
@rm -f "$@"
|
||||
ln "$^" "$@"
|
||||
ln "$?" "$@"
|
||||
|
||||
${top_srcdir}/demo/favicon.ico: ${top_srcdir}/shellinabox/favicon.ico
|
||||
@rm -f "$@"
|
||||
ln "$^" "$@"
|
||||
ln "$?" "$@"
|
||||
|
||||
${top_srcdir}/demo/styles.css: ${top_srcdir}/shellinabox/styles.css
|
||||
@rm -f "$@"
|
||||
sed -e '/\[if DEFINES_COLORS\]/,/\[endif DEFINES_COLORS\]/d' "$^" >"$@"
|
||||
sed -e '/\[if DEFINES_COLORS\]/,/\[endif DEFINES_COLORS\]/d' "$?" >"$@"
|
||||
|
||||
${top_srcdir}/demo/print-styles.css: ${top_srcdir}/shellinabox/print-styles.css
|
||||
@rm -f "$@"
|
||||
ln "$^" "$@"
|
||||
ln "$?" "$@"
|
||||
|
||||
${top_srcdir}/demo/usercss-0.css: ${top_srcdir}/shellinabox/white-on-black.css
|
||||
@rm -f "$@"
|
||||
ln "$^" "$@"
|
||||
ln "$?" "$@"
|
||||
|
||||
${top_srcdir}/demo/usercss-1.css: ${top_srcdir}/shellinabox/black-on-white.css
|
||||
@rm -f "$@"
|
||||
ln "$^" "$@"
|
||||
ln "$?" "$@"
|
||||
|
||||
${top_srcdir}/demo/usercss-2.css: ${top_srcdir}/shellinabox/monochrome.css
|
||||
@rm -f "$@"
|
||||
ln "$^" "$@"
|
||||
ln "$?" "$@"
|
||||
|
||||
${top_srcdir}/demo/usercss-3.css: ${top_srcdir}/shellinabox/color.css
|
||||
@rm -f "$@"
|
||||
ln "$^" "$@"
|
||||
ln "$?" "$@"
|
||||
|
||||
${top_srcdir}/demo/vt100.js: ${top_srcdir}/shellinabox/vt100.js
|
||||
@rm -f "$@"
|
||||
ln "$^" "$@"
|
||||
ln "$?" "$@"
|
||||
|
||||
shellinaboxd.1: shellinabox/shellinaboxd.man.in config.h
|
||||
@src="${top_srcdir}/shellinabox/shellinaboxd.man.in"; \
|
||||
|
|
20
Makefile.in
20
Makefile.in
|
@ -1172,43 +1172,43 @@ ${top_srcdir}/demo/demo.js: ${top_srcdir}/demo/beep.wav \
|
|||
|
||||
${top_srcdir}/demo/beep.wav: ${top_srcdir}/shellinabox/beep.wav
|
||||
@rm -f "$@"
|
||||
ln "$^" "$@"
|
||||
ln "$?" "$@"
|
||||
|
||||
${top_srcdir}/demo/enabled.gif: ${top_srcdir}/shellinabox/enabled.gif
|
||||
@rm -f "$@"
|
||||
ln "$^" "$@"
|
||||
ln "$?" "$@"
|
||||
|
||||
${top_srcdir}/demo/favicon.ico: ${top_srcdir}/shellinabox/favicon.ico
|
||||
@rm -f "$@"
|
||||
ln "$^" "$@"
|
||||
ln "$?" "$@"
|
||||
|
||||
${top_srcdir}/demo/styles.css: ${top_srcdir}/shellinabox/styles.css
|
||||
@rm -f "$@"
|
||||
sed -e '/\[if DEFINES_COLORS\]/,/\[endif DEFINES_COLORS\]/d' "$^" >"$@"
|
||||
sed -e '/\[if DEFINES_COLORS\]/,/\[endif DEFINES_COLORS\]/d' "$?" >"$@"
|
||||
|
||||
${top_srcdir}/demo/print-styles.css: ${top_srcdir}/shellinabox/print-styles.css
|
||||
@rm -f "$@"
|
||||
ln "$^" "$@"
|
||||
ln "$?" "$@"
|
||||
|
||||
${top_srcdir}/demo/usercss-0.css: ${top_srcdir}/shellinabox/white-on-black.css
|
||||
@rm -f "$@"
|
||||
ln "$^" "$@"
|
||||
ln "$?" "$@"
|
||||
|
||||
${top_srcdir}/demo/usercss-1.css: ${top_srcdir}/shellinabox/black-on-white.css
|
||||
@rm -f "$@"
|
||||
ln "$^" "$@"
|
||||
ln "$?" "$@"
|
||||
|
||||
${top_srcdir}/demo/usercss-2.css: ${top_srcdir}/shellinabox/monochrome.css
|
||||
@rm -f "$@"
|
||||
ln "$^" "$@"
|
||||
ln "$?" "$@"
|
||||
|
||||
${top_srcdir}/demo/usercss-3.css: ${top_srcdir}/shellinabox/color.css
|
||||
@rm -f "$@"
|
||||
ln "$^" "$@"
|
||||
ln "$?" "$@"
|
||||
|
||||
${top_srcdir}/demo/vt100.js: ${top_srcdir}/shellinabox/vt100.js
|
||||
@rm -f "$@"
|
||||
ln "$^" "$@"
|
||||
ln "$?" "$@"
|
||||
|
||||
shellinaboxd.1: shellinabox/shellinaboxd.man.in config.h
|
||||
@src="${top_srcdir}/shellinabox/shellinaboxd.man.in"; \
|
||||
|
|
2
config.h
2
config.h
|
@ -153,7 +153,7 @@
|
|||
#define STDC_HEADERS 1
|
||||
|
||||
/* Most recent revision number in the version control system */
|
||||
#define VCS_REVISION "209"
|
||||
#define VCS_REVISION "210"
|
||||
|
||||
/* Version number of package */
|
||||
#define VERSION "2.10"
|
||||
|
|
2
configure
vendored
2
configure
vendored
|
@ -2328,7 +2328,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
|
|||
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||||
|
||||
|
||||
VCS_REVISION=209
|
||||
VCS_REVISION=210
|
||||
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
|
|
|
@ -2,7 +2,7 @@ AC_PREREQ(2.57)
|
|||
|
||||
dnl This is the one location where the authoritative version number is stored
|
||||
AC_INIT(shellinabox, 2.10, markus@shellinabox.com)
|
||||
VCS_REVISION=209
|
||||
VCS_REVISION=210
|
||||
AC_SUBST(VCS_REVISION)
|
||||
AC_DEFINE_UNQUOTED(VCS_REVISION, "${VCS_REVISION}",
|
||||
[Most recent revision number in the version control system])
|
||||
|
|
|
@ -1955,7 +1955,7 @@ VT100.prototype.toggleBell = function() {
|
|||
};
|
||||
|
||||
VT100.prototype.about = function() {
|
||||
alert("VT100 Terminal Emulator " + "2.10 (revision 209)" +
|
||||
alert("VT100 Terminal Emulator " + "2.10 (revision 210)" +
|
||||
"\nCopyright 2008-2010 by Markus Gutschke\n" +
|
||||
"For more information check http://shellinabox.com");
|
||||
};
|
||||
|
|
|
@ -358,7 +358,7 @@ ShellInABox.prototype.extendContextMenu = function(entries, actions) {
|
|||
};
|
||||
|
||||
ShellInABox.prototype.about = function() {
|
||||
alert("Shell In A Box version " + "2.10 (revision 209)" +
|
||||
alert("Shell In A Box version " + "2.10 (revision 210)" +
|
||||
"\nCopyright 2008-2010 by Markus Gutschke\n" +
|
||||
"For more information check http://shellinabox.com" +
|
||||
(typeof serverSupportsSSL != 'undefined' && serverSupportsSSL ?
|
||||
|
|
|
@ -1955,7 +1955,7 @@ VT100.prototype.toggleBell = function() {
|
|||
};
|
||||
|
||||
VT100.prototype.about = function() {
|
||||
alert("VT100 Terminal Emulator " + "2.10 (revision 209)" +
|
||||
alert("VT100 Terminal Emulator " + "2.10 (revision 210)" +
|
||||
"\nCopyright 2008-2010 by Markus Gutschke\n" +
|
||||
"For more information check http://shellinabox.com");
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue