mirror of
https://github.com/0intro/wmii
synced 2024-11-24 22:59:45 +03:00
Remove some build system cruft.
This commit is contained in:
parent
18e4975974
commit
2a8d326db5
@ -1,4 +1,4 @@
|
||||
#!/usr/bin/env wmii9rc
|
||||
#!/usr/bin/env rc
|
||||
cd
|
||||
scriptname=$0
|
||||
oldpath=$path; path=($PLAN9/bin $path)
|
||||
|
@ -10,7 +10,6 @@ TARG = wihack \
|
||||
wmii.rc \
|
||||
wmii.sh \
|
||||
wmii9menu \
|
||||
wmii9rc \
|
||||
wmiir
|
||||
|
||||
OFILES = util.o
|
||||
|
@ -1,24 +0,0 @@
|
||||
#!/bin/sh -f
|
||||
RC=""
|
||||
IFS=:
|
||||
for i in "$PLAN9" `echo "@P9PATHS@"`; do
|
||||
if [ -d "$i" -a -x "$i/bin/rc" ]; then
|
||||
export PLAN9="$i"
|
||||
RC="$i/bin/rc"
|
||||
break;
|
||||
fi
|
||||
done
|
||||
|
||||
if [ -z "$RC" ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ ! -x "$PLAN9/bin/read" ]; then
|
||||
echo 1>&2 $0: Found rc, but not read'(1)'. You probably have an out-of-date 9base installed.
|
||||
fi
|
||||
|
||||
if [ -n "$1" ]; then
|
||||
exec "$RC" "$@"
|
||||
else
|
||||
true
|
||||
fi
|
@ -10,9 +10,11 @@ PREFIX = /usr/local
|
||||
INCLUDE = $(PREFIX)/include
|
||||
|
||||
# Includes and libs
|
||||
INCPATH = .:$(ROOT)/include:$(INCLUDE):/usr/include
|
||||
INCLUDES = -I. -I$(ROOT)/include -I$(INCLUDE) -I/usr/include
|
||||
LIBS = -L$(ROOT)/lib -L/usr/lib
|
||||
|
||||
TERMINAL = xterm
|
||||
|
||||
# Flags
|
||||
include $(ROOT)/mk/gcc.mk
|
||||
CFLAGS += $(DEBUGCFLAGS) -O0
|
||||
@ -27,8 +29,6 @@ LD = cc
|
||||
# Archiver
|
||||
AR = ar crs
|
||||
|
||||
AWKPATH = $$(which awk)
|
||||
P9PATHS = ${PLAN9}:"'$${HOME}/plan9'":/usr/local/plan9:/usr/local/9:/opt/plan9:/opt/9:/usr/plan9:/usr/9
|
||||
# Your make shell. By default, the first found of /bin/dash, /bin/ksh,
|
||||
# /bin/sh. Except with bsdmake, which assumes /bin/sh is sane. bash and zsh
|
||||
# are painfully slow, and should be avoided.
|
||||
|
10
man/wmii.1
10
man/wmii.1
@ -174,7 +174,7 @@ An action is a shell script in the default setup, but it can
|
||||
actually be any executable file. It is executed usually by
|
||||
selecting it from the actions menu. You can customize an action
|
||||
by copying it from the global action directory
|
||||
\&'/home/kris/wmiiinst/etc/wmii\-3.5' to '\fB$HOME\fR/.wmii\-3.5' and then
|
||||
\&'@CONFPREFIX@/wmii\-3.5' to '\fB$HOME\fR/.wmii\-3.5' and then
|
||||
editing the copy to fit your needs. Of course you can also
|
||||
create your own actions there; make sure that they are
|
||||
executable.
|
||||
@ -227,7 +227,7 @@ tab(^); ll.
|
||||
Mod\-Shift\-c^\fBKill\fR the selected client
|
||||
Mod\-p \fI<program>\fR^\fBExecute\fR \fI<program>\fR
|
||||
Mod\-a \fI<action>\fR^\fBExecute\fR the named <action
|
||||
Mod\-Enter^\fBExecute\fR an \fBxterm\fR
|
||||
Mod\-Enter^\fBExecute\fR an \fB@TERMINAL@\fR
|
||||
.TE
|
||||
|
||||
.SH Configuration
|
||||
@ -534,10 +534,10 @@ them.
|
||||
/tmp/ns.\fB$USER\fR.\fB${DISPLAY\fR%.0\fB}\fR/wmii
|
||||
The wmii socket file which provides a 9P service.
|
||||
.TP
|
||||
/home/kris/wmiiinst/etc/wmii-hg
|
||||
@CONFPREFIX@/wmii@CONFVERSION@
|
||||
Global action directory.
|
||||
.TP
|
||||
\fB$HOME\fR/.wmii-hg
|
||||
\fB$HOME\fR/.wmii@CONFVERSION@
|
||||
User\-specific action directory. Actions are first searched here.
|
||||
|
||||
|
||||
@ -559,7 +559,7 @@ Socket file of Used by wmiir(1).
|
||||
dmenu(1), wmiir(1)
|
||||
|
||||
.P
|
||||
/home/kris/wmiiinst/share/doc/wmii/wmii.pdf
|
||||
@DOCDIR@/wmii.pdf
|
||||
|
||||
.P
|
||||
\fI[1]\fR http://www.suckless.org/wiki/wmii/tips/9p_tips
|
||||
|
@ -190,7 +190,7 @@ Here is a list of the default actions:
|
||||
| Mod-Shift-c | `Kill` the selected client
|
||||
| Mod-p <program> | `Execute` <program>
|
||||
| Mod-a <action> | `Execute` the named <action
|
||||
| Mod-Enter | `Execute` an `xterm`
|
||||
| Mod-Enter | `Execute` an `@TERMINAL@`
|
||||
|
||||
= Configuration =
|
||||
|
||||
|
20
mk/hdr.mk
20
mk/hdr.mk
@ -1,12 +1,18 @@
|
||||
FILTER = cat
|
||||
EXCFLAGS = -I$$(echo $(INCPATH)|sed 's/:/ -I/g') -D_XOPEN_SOURCE=600
|
||||
COMPILE= CC="$(CC)" CFLAGS="$(EXCFLAGS) $(CFLAGS) $$(pkg-config --cflags $(PACKAGES))" $(ROOT)/util/compile
|
||||
COMPILEPIC= CC="$(CC)" CFLAGS="$(EXCFLAGS) $(CFLAGS) $$(pkg-config --cflags $(PACKAGES)) $(SOCFLAGS)" $(ROOT)/util/compile
|
||||
LINK= LD="$(LD)" LDFLAGS="$(LDFLAGS) $$(pkg-config --libs $(PACKAGES))" $(ROOT)/util/link
|
||||
LINKSO= LD="$(LD)" LDFLAGS="$(SOLDFLAGS) $(SHARED) $$(pkg-config --libs $(PACKAGES))" $(ROOT)/util/link
|
||||
|
||||
EXCFLAGS = $(INCLUDES) -D_XOPEN_SOURCE=600
|
||||
|
||||
COMPILE = $(ROOT)/util/compile "$(CC)" "$(EXCFLAGS) $(CFLAGS) $$(pkg-config --cflags $(PACKAGES))"
|
||||
COMPILEPIC = $(ROOT)/util/compile "$(CC)" "$(EXCFLAGS) $(CFLAGS) $$(pkg-config --cflags $(PACKAGES)) $(SOCFLAGS)"
|
||||
|
||||
LINK = $(ROOT)/util/link "$(LD)" "$$(pkg-config --libs $(PACKAGES)) $(LDFLAGS)"
|
||||
LINKSO = $(ROOT)/util/link "$(LD)" "$$(pkg-config --libs $(PACKAGES)) $(SOLDFLAGS) $(SHARED)"
|
||||
|
||||
CLEANNAME=$(ROOT)/util/cleanname
|
||||
|
||||
SOEXT=so
|
||||
TAGFILES=
|
||||
|
||||
CTAGS=ctags
|
||||
|
||||
PACKAGES = 2>/dev/null
|
||||
@ -61,7 +67,7 @@ all:
|
||||
chmod 0755 $@
|
||||
.man1.1:
|
||||
echo TXT2TAGS $(BASE)$<
|
||||
txt2tags -o- $< | $(FILTER) >$@
|
||||
txt2tags -o- $< >$@
|
||||
|
||||
.out.install:
|
||||
echo INSTALL $$($(CLEANNAME) $(BASE)$*)
|
||||
@ -100,7 +106,7 @@ all:
|
||||
man=1; \
|
||||
path="$(MAN)/man$$man/$*.$$man"; \
|
||||
echo INSTALL man $$($(CLEANNAME) "$(BASE)/$*($$man)"); \
|
||||
cp "$<" $(DESTDIR)"$$path"; \
|
||||
$(FILTER) <"$<" >$(DESTDIR)"$$path"; \
|
||||
chmod 0644 $(DESTDIR)"$$path"
|
||||
.1.uninstall:
|
||||
echo UNINSTALL man $$($(CLEANNAME) $*'(1)')
|
||||
|
@ -10,9 +10,8 @@ CFLAGS += '-DVERSION=\"$(VERSION)\"' '-DCOPYRIGHT=\"$(COPYRIGHT)\"' \
|
||||
'-DCONFVERSION=\"$(CONFVERSION)\"' '-DCONFPREFIX=\"$(ETC)\"'
|
||||
FILTER = sed "s|@CONFPREFIX@|$(ETC)|g; \
|
||||
s|@CONFVERSION@|$(CONFVERSION)|g; \
|
||||
s|@P9PATHS@|$(P9PATHS)|g; \
|
||||
s|@DOCDIR@|$(DOC)|g; \
|
||||
s|@LIBDIR@|$(LIBDIR)|g; \
|
||||
s|@BINSH@|$(BINSH)|g; \
|
||||
s|@AWKPATH@|$(AWKPATH)|g"
|
||||
s|@TERMINAL@|$(TERMINAL)|g;"
|
||||
|
||||
|
@ -13,7 +13,7 @@ configuration variable which contains the Alt key by default.
|
||||
|
||||
Let's go!
|
||||
|
||||
- Start two xterms by pressing M-Return twice.
|
||||
- Start two @TERMINAL@s by pressing M-Return twice.
|
||||
- Switch between the three windows: M-j, M-k,
|
||||
M-h, M-l
|
||||
If you prefer to use the mouse, then just move the pointer to
|
||||
|
@ -22,7 +22,7 @@ WMII_BACKGROUND='#333333'
|
||||
WMII_FONT='-*-fixed-medium-r-*-*-13-*-*-*-*-*-*-*'
|
||||
|
||||
set -- $(echo $WMII_NORMCOLORS $WMII_FOCUSCOLORS)
|
||||
WMII_TERM="xterm"
|
||||
WMII_TERM="@TERMINAL@"
|
||||
|
||||
# Menu history
|
||||
hist="${WMII_CONFPATH%%:*}/history"
|
||||
|
@ -1,5 +1,8 @@
|
||||
#!/bin/sh -f
|
||||
|
||||
CC=$1
|
||||
CFLAGS=$2; shift 2
|
||||
|
||||
outfile="$1"; shift
|
||||
bin="$(echo $0 | sed 's,/[^/]*$,,')"
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user