Cleanup the top directory a bit. sed -i 's/\$\{([^{]+)\}/$(\1)/g' **/Makefile **/*.mk

2010-05-22 20:55:16 -04:00 · 2010-05-22 20:55:16 -04:00 · ae3c20b7ae
parent c04f3ec6a0
commit ae3c20b7ae
294 changed files with 83 additions and 71 deletions
--- a/19
+++ b/19
@ -1,23 +1,15 @@
 ROOT=.
-include ${ROOT}/mk/hdr.mk
-include ${ROOT}/mk/wmii.mk
+include $(ROOT)/mk/hdr.mk
+include $(ROOT)/mk/wmii.mk

-PDIRS = \
+DIRS = \
 	doc	     \
 	man	     \
+	lib	     \
 	cmd	     \
-	libwmii_hack \
 	rc	     \
 	alternative_wmiircs

-DIRS =	\
-	libstuff  \
-	libbio    \
-	libfmt	  \
-	libregexp \
-	libutf	  \
-	$(PDIRS)
-
 DOCS = README \
       LICENSE

@ -34,6 +26,5 @@ deb:
 	dpkg-buildpackage -rfakeroot -b -nc
 	[ -d .hg ] && hg revert debian/changelog

-include ${ROOT}/mk/dir.mk
-INSTDIRS = $(PDIRS)
+include $(ROOT)/mk/dir.mk

--- a/3
+++ b/3
@ -1,3 +1,6 @@
+3.1b1:
+    * Xft is now loaded on demand
+    * colrules widths may now be specified in pixels

 3.9b1:
    * wmii9menu is now Xinerama aware.
--- a/cmd/click/Makefile
+++ b/cmd/click/Makefile
@ -1,8 +1,8 @@
 ROOT= ../..
-include ${ROOT}/mk/hdr.mk
-include ${ROOT}/mk/wmii.mk
+include $(ROOT)/mk/hdr.mk
+include $(ROOT)/mk/wmii.mk

-main.c: ${ROOT}/mk/wmii.mk
+main.c: $(ROOT)/mk/wmii.mk

 TARG =	click
 HFILES=	dat.h fns.h
@ -14,5 +14,5 @@ LIBS += -lm -lXtst $(LIBS9)
 CFLAGS += -DIXP_NEEDAPI=86
 OBJ =	main

-include ${ROOT}/mk/one.mk
+include $(ROOT)/mk/one.mk

--- a/cmd/strut/Makefile
+++ b/cmd/strut/Makefile
@ -1,8 +1,8 @@
 ROOT= ../..
-include ${ROOT}/mk/hdr.mk
-include ${ROOT}/mk/wmii.mk
+include $(ROOT)/mk/hdr.mk
+include $(ROOT)/mk/wmii.mk

-main.c: ${ROOT}/mk/wmii.mk
+main.c: $(ROOT)/mk/wmii.mk

 TARG =	wistrut
 HFILES=	dat.h fns.h
@ -16,5 +16,5 @@ OBJ =	main	\
 	ewmh	\
 	win

-include ${ROOT}/mk/one.mk
+include $(ROOT)/mk/one.mk

--- a/include/Makefile
+++ b/include/Makefile
@ -1,6 +1,6 @@
 ROOT= ..
-include ${ROOT}/mk/hdr.mk
+include $(ROOT)/mk/hdr.mk

 HFILES = ixp.h ixp_fcall.h

-include ${ROOT}/mk/common.mk
+include $(ROOT)/mk/common.mk
--- a/lib/Makefile
+++ b/lib/Makefile
@ -0,0 +1,18 @@
+ROOT=..
+include $(ROOT)/mk/hdr.mk
+include $(ROOT)/mk/wmii.mk
+
+PDIRS = \
+	libwmii_hack
+
+DIRS =	\
+	libstuff  \
+	libbio    \
+	libfmt	  \
+	libregexp \
+	libutf	  \
+	$(PDIRS)
+
+include $(ROOT)/mk/dir.mk
+INSTDIRS = $(PDIRS)
+
--- a/lib/libbio/Makefile
+++ b/lib/libbio/Makefile
@ -1,5 +1,5 @@
-ROOT= ..
-include ${ROOT}/mk/hdr.mk
+ROOT= ../..
+include $(ROOT)/mk/hdr.mk

 VERSION=2.0
 TARG=libbio
@ -23,5 +23,5 @@ OBJ=\
 	bseek\
 	bwrite

-include ${ROOT}/mk/lib.mk
+include $(ROOT)/mk/lib.mk

--- a/lib/libbio/NOTICE
+++ b/lib/libbio/NOTICE
--- a/lib/libbio/README
+++ b/lib/libbio/README
--- a/lib/libbio/bbuffered.c
+++ b/lib/libbio/bbuffered.c
--- a/lib/libbio/bcat.c
+++ b/lib/libbio/bcat.c
--- a/lib/libbio/bfildes.c
+++ b/lib/libbio/bfildes.c
--- a/lib/libbio/bflush.c
+++ b/lib/libbio/bflush.c
--- a/lib/libbio/bgetc.c
+++ b/lib/libbio/bgetc.c
--- a/lib/libbio/bgetd.c
+++ b/lib/libbio/bgetd.c
--- a/lib/libbio/bgetrune.c
+++ b/lib/libbio/bgetrune.c
--- a/lib/libbio/binit.c
+++ b/lib/libbio/binit.c
--- a/lib/libbio/bio.3
+++ b/lib/libbio/bio.3
--- a/lib/libbio/boffset.c
+++ b/lib/libbio/boffset.c
--- a/lib/libbio/bprint.c
+++ b/lib/libbio/bprint.c
--- a/lib/libbio/bputc.c
+++ b/lib/libbio/bputc.c
--- a/lib/libbio/bputrune.c
+++ b/lib/libbio/bputrune.c
--- a/lib/libbio/brdline.c
+++ b/lib/libbio/brdline.c
--- a/lib/libbio/brdstr.c
+++ b/lib/libbio/brdstr.c
--- a/lib/libbio/bread.c
+++ b/lib/libbio/bread.c
--- a/lib/libbio/bseek.c
+++ b/lib/libbio/bseek.c
--- a/lib/libbio/bvprint.c
+++ b/lib/libbio/bvprint.c
--- a/lib/libbio/bwrite.c
+++ b/lib/libbio/bwrite.c
--- a/lib/libfmt/Makefile
+++ b/lib/libfmt/Makefile
@ -1,5 +1,5 @@
-ROOT= ..
-include ${ROOT}/mk/hdr.mk
+ROOT= ../..
+include $(ROOT)/mk/hdr.mk

 VERSION=2.0
 TARG=libfmt
@ -44,5 +44,5 @@ OBJ=\
 	vsnprint\
 	$(NUM)

-include ${ROOT}/mk/lib.mk
+include $(ROOT)/mk/lib.mk

--- a/lib/libfmt/NOTICE
+++ b/lib/libfmt/NOTICE
--- a/lib/libfmt/README
+++ b/lib/libfmt/README
--- a/lib/libfmt/charstod.c
+++ b/lib/libfmt/charstod.c
--- a/lib/libfmt/dofmt.c
+++ b/lib/libfmt/dofmt.c
--- a/lib/libfmt/dorfmt.c
+++ b/lib/libfmt/dorfmt.c
--- a/lib/libfmt/errfmt.c
+++ b/lib/libfmt/errfmt.c
--- a/lib/libfmt/fltfmt.c
+++ b/lib/libfmt/fltfmt.c
--- a/lib/libfmt/fmt.c
+++ b/lib/libfmt/fmt.c
--- a/lib/libfmt/fmtdef.h
+++ b/lib/libfmt/fmtdef.h
--- a/lib/libfmt/fmtfd.c
+++ b/lib/libfmt/fmtfd.c
--- a/lib/libfmt/fmtfdflush.c
+++ b/lib/libfmt/fmtfdflush.c
--- a/lib/libfmt/fmtinstall.3
+++ b/lib/libfmt/fmtinstall.3
--- a/lib/libfmt/fmtlock.c
+++ b/lib/libfmt/fmtlock.c
--- a/lib/libfmt/fmtprint.c
+++ b/lib/libfmt/fmtprint.c
--- a/lib/libfmt/fmtquote.c
+++ b/lib/libfmt/fmtquote.c
--- a/lib/libfmt/fmtrune.c
+++ b/lib/libfmt/fmtrune.c
--- a/lib/libfmt/fmtstr.c
+++ b/lib/libfmt/fmtstr.c
--- a/lib/libfmt/fmtvprint.c
+++ b/lib/libfmt/fmtvprint.c
--- a/lib/libfmt/fprint.c
+++ b/lib/libfmt/fprint.c
--- a/lib/libfmt/libfmt.a
+++ b/lib/libfmt/libfmt.a
--- a/lib/libfmt/nan64.c
+++ b/lib/libfmt/nan64.c
--- a/lib/libfmt/pow10.c
+++ b/lib/libfmt/pow10.c
--- a/lib/libfmt/print.3
+++ b/lib/libfmt/print.3
--- a/lib/libfmt/print.c
+++ b/lib/libfmt/print.c
--- a/lib/libfmt/runefmtstr.c
+++ b/lib/libfmt/runefmtstr.c
--- a/lib/libfmt/runeseprint.c
+++ b/lib/libfmt/runeseprint.c
--- a/lib/libfmt/runesmprint.c
+++ b/lib/libfmt/runesmprint.c
--- a/lib/libfmt/runesnprint.c
+++ b/lib/libfmt/runesnprint.c
--- a/lib/libfmt/runesprint.c
+++ b/lib/libfmt/runesprint.c
--- a/lib/libfmt/runevseprint.c
+++ b/lib/libfmt/runevseprint.c
--- a/lib/libfmt/runevsmprint.c
+++ b/lib/libfmt/runevsmprint.c
--- a/lib/libfmt/runevsnprint.c
+++ b/lib/libfmt/runevsnprint.c
--- a/lib/libfmt/seprint.c
+++ b/lib/libfmt/seprint.c
--- a/lib/libfmt/smprint.c
+++ b/lib/libfmt/smprint.c
--- a/lib/libfmt/snprint.c
+++ b/lib/libfmt/snprint.c
--- a/lib/libfmt/sprint.c
+++ b/lib/libfmt/sprint.c
--- a/lib/libfmt/strtod.c
+++ b/lib/libfmt/strtod.c
--- a/lib/libfmt/test.c
+++ b/lib/libfmt/test.c
--- a/lib/libfmt/test2.c
+++ b/lib/libfmt/test2.c
--- a/lib/libfmt/test3.c
+++ b/lib/libfmt/test3.c
--- a/lib/libfmt/vfprint.c
+++ b/lib/libfmt/vfprint.c
--- a/lib/libfmt/vseprint.c
+++ b/lib/libfmt/vseprint.c
--- a/lib/libfmt/vsmprint.c
+++ b/lib/libfmt/vsmprint.c
--- a/lib/libfmt/vsnprint.c
+++ b/lib/libfmt/vsnprint.c
--- a/lib/libregexp/Makefile
+++ b/lib/libregexp/Makefile
@ -1,5 +1,5 @@
-ROOT= ..
-include ${ROOT}/mk/hdr.mk
+ROOT= ../..
+include $(ROOT)/mk/hdr.mk

 VERSION=2.0
 TARG=libregexp9
@ -13,5 +13,5 @@ OBJ=\
 	rregexec\
 	rregsub

-include ${ROOT}/mk/lib.mk
+include $(ROOT)/mk/lib.mk

--- a/lib/libregexp/NOTICE
+++ b/lib/libregexp/NOTICE
--- a/lib/libregexp/README
+++ b/lib/libregexp/README
--- a/lib/libregexp/regaux.c
+++ b/lib/libregexp/regaux.c
--- a/lib/libregexp/regcomp.c
+++ b/lib/libregexp/regcomp.c
--- a/lib/libregexp/regerror.c
+++ b/lib/libregexp/regerror.c
--- a/lib/libregexp/regexec.c
+++ b/lib/libregexp/regexec.c
--- a/lib/libregexp/regexp9.3
+++ b/lib/libregexp/regexp9.3
--- a/lib/libregexp/regexp9.7
+++ b/lib/libregexp/regexp9.7
--- a/lib/libregexp/regsub.c
+++ b/lib/libregexp/regsub.c
--- a/lib/libregexp/rregexec.c
+++ b/lib/libregexp/rregexec.c
--- a/lib/libregexp/rregsub.c
+++ b/lib/libregexp/rregsub.c
--- a/lib/libregexp/test.c
+++ b/lib/libregexp/test.c
--- a/lib/libregexp/test2.c
+++ b/lib/libregexp/test2.c
--- a/lib/libstuff/Makefile
+++ b/lib/libstuff/Makefile
@ -1,5 +1,5 @@
-ROOT= ..
-include ${ROOT}/mk/hdr.mk
+ROOT= ../..
+include $(ROOT)/mk/hdr.mk

 TARG=libstuff

@ -168,5 +168,5 @@ OBJ=\
 	x11/windows/window	\
 	xext

-include ${ROOT}/mk/lib.mk
+include $(ROOT)/mk/lib.mk

--- a/lib/libstuff/buffer.c
+++ b/lib/libstuff/buffer.c
--- a/lib/libstuff/clientutil.c
+++ b/lib/libstuff/clientutil.c
--- a/lib/libstuff/event/buttonpress.c
+++ b/lib/libstuff/event/buttonpress.c
--- a/lib/libstuff/event/buttonrelease.c
+++ b/lib/libstuff/event/buttonrelease.c
--- a/lib/libstuff/event/clientmessage.c
+++ b/lib/libstuff/event/clientmessage.c
--- a/lib/libstuff/event/configurenotify.c
+++ b/lib/libstuff/event/configurenotify.c
--- a/lib/libstuff/event/configurerequest.c
+++ b/lib/libstuff/event/configurerequest.c
--- a/lib/libstuff/event/destroynotify.c
+++ b/lib/libstuff/event/destroynotify.c
--- a/lib/libstuff/event/enternotify.c
+++ b/lib/libstuff/event/enternotify.c
--- a/lib/libstuff/event/event.c
+++ b/lib/libstuff/event/event.c
--- a/lib/libstuff/event/event.h
+++ b/lib/libstuff/event/event.h
--- a/lib/libstuff/event/expose.c
+++ b/lib/libstuff/event/expose.c
--- a/Show More
+++ b/Show More