| 1 |
xarthisius 11/08/02 04:55:29 |
| 2 |
|
| 3 |
Added: i3-4.0.1-gentoo.diff |
| 4 |
Removed: i3-4.0-gentoo.diff |
| 5 |
Log: |
| 6 |
Version bump, drop old |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha49/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 x11-wm/i3/files/i3-4.0.1-gentoo.diff |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/i3/files/i3-4.0.1-gentoo.diff?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/i3/files/i3-4.0.1-gentoo.diff?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: i3-4.0.1-gentoo.diff |
| 17 |
=================================================================== |
| 18 |
--- a/common.mk |
| 19 |
+++ b/common.mk |
| 20 |
@@ -1,5 +1,5 @@ |
| 21 |
UNAME=$(shell uname) |
| 22 |
-DEBUG=1 |
| 23 |
+DEBUG=0 |
| 24 |
COVERAGE=0 |
| 25 |
INSTALL=install |
| 26 |
ifndef PREFIX |
| 27 |
@@ -12,7 +12,7 @@ |
| 28 |
SYSCONFDIR=$(PREFIX)/etc |
| 29 |
endif |
| 30 |
endif |
| 31 |
-TERM_EMU=xterm |
| 32 |
+TERM_EMU=urxvt |
| 33 |
# The escaping is absurd, but we need to escape for shell, sed, make, define |
| 34 |
GIT_VERSION:="4.0 (2011-07-31, branch \\\"master\\\")" |
| 35 |
VERSION:=4.0 |
| 36 |
@@ -103,9 +103,6 @@ |
| 37 |
# Extended debugging flags, macros shall be available in gcc |
| 38 |
CFLAGS += -gdwarf-2 |
| 39 |
CFLAGS += -g3 |
| 40 |
-else |
| 41 |
-CFLAGS += -O2 |
| 42 |
-CFLAGS += -freorder-blocks-and-partition |
| 43 |
endif |
| 44 |
|
| 45 |
ifeq ($(COVERAGE),1) |
| 46 |
@@ -113,9 +110,6 @@ |
| 47 |
LIBS += -lgcov |
| 48 |
endif |
| 49 |
|
| 50 |
-# Don’t print command lines which are run |
| 51 |
-.SILENT: |
| 52 |
- |
| 53 |
# Always remake the following targets |
| 54 |
.PHONY: install clean dist distclean |
| 55 |
|
| 56 |
--- a/Makefile |
| 57 |
+++ b/Makefile |
| 58 |
@@ -22,24 +22,19 @@ |
| 59 |
|
| 60 |
# Depend on the specific file (.c for each .o) and on all headers |
| 61 |
src/%.o: src/%.c ${HEADERS} |
| 62 |
- echo "CC $<" |
| 63 |
$(CC) $(CPPFLAGS) $(CFLAGS) -DLOGLEVEL="((uint64_t)1 << $(shell awk '/$(shell basename $< .c)/ { print NR; exit 0; }' loglevels.tmp))" -c -o $@ $< |
| 64 |
|
| 65 |
all: i3 subdirs |
| 66 |
|
| 67 |
i3: src/cfgparse.y.o src/cfgparse.yy.o src/cmdparse.y.o src/cmdparse.yy.o ${FILES} |
| 68 |
- echo "LINK i3" |
| 69 |
$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) |
| 70 |
|
| 71 |
subdirs: |
| 72 |
for dir in $(SUBDIRS); do \ |
| 73 |
- echo ""; \ |
| 74 |
- echo "MAKE $$dir"; \ |
| 75 |
$(MAKE) -C $$dir; \ |
| 76 |
done |
| 77 |
|
| 78 |
loglevels.h: |
| 79 |
- echo "LOGLEVELS" |
| 80 |
for file in $$(ls src/*.c src/*.y src/*.l | grep -v 'cfgparse.\(tab\|yy\).c'); \ |
| 81 |
do \ |
| 82 |
echo $$(basename $$file .c); \ |
| 83 |
@@ -51,29 +46,24 @@ |
| 84 |
echo "};") > include/loglevels.h; |
| 85 |
|
| 86 |
src/cfgparse.yy.o: src/cfgparse.l src/cfgparse.y.o ${HEADERS} |
| 87 |
- echo "LEX $<" |
| 88 |
flex -i -o$(@:.o=.c) $< |
| 89 |
$(CC) $(CPPFLAGS) $(CFLAGS) -DLOGLEVEL="(1 << $(shell awk '/cfgparse.l/ { print NR }' loglevels.tmp))" -c -o $@ $(@:.o=.c) |
| 90 |
|
| 91 |
src/cmdparse.yy.o: src/cmdparse.l src/cmdparse.y.o ${HEADERS} |
| 92 |
- echo "LEX $<" |
| 93 |
flex -Pcmdyy -i -o$(@:.o=.c) $< |
| 94 |
$(CC) $(CPPFLAGS) $(CFLAGS) -DLOGLEVEL="(1 << $(shell awk '/cmdparse.l/ { print NR }' loglevels.tmp))" -c -o $@ $(@:.o=.c) |
| 95 |
|
| 96 |
|
| 97 |
src/cfgparse.y.o: src/cfgparse.y ${HEADERS} |
| 98 |
- echo "YACC $<" |
| 99 |
bison --debug --verbose -b $(basename $< .y) -d $< |
| 100 |
$(CC) $(CPPFLAGS) $(CFLAGS) -DLOGLEVEL="(1 << $(shell awk '/cfgparse.y/ { print NR }' loglevels.tmp))" -c -o $@ $(<:.y=.tab.c) |
| 101 |
|
| 102 |
src/cmdparse.y.o: src/cmdparse.y ${HEADERS} |
| 103 |
- echo "YACC $<" |
| 104 |
bison -p cmdyy --debug --verbose -b $(basename $< .y) -d $< |
| 105 |
$(CC) $(CPPFLAGS) $(CFLAGS) -DLOGLEVEL="(1 << $(shell awk '/cmdparse.y/ { print NR }' loglevels.tmp))" -c -o $@ $(<:.y=.tab.c) |
| 106 |
|
| 107 |
|
| 108 |
install: all |
| 109 |
- echo "INSTALL" |
| 110 |
$(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/bin |
| 111 |
$(INSTALL) -d -m 0755 $(DESTDIR)$(SYSCONFDIR)/i3 |
| 112 |
$(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/include/i3 |
| 113 |
@@ -88,6 +78,7 @@ |
| 114 |
for dir in $(SUBDIRS); do \ |
| 115 |
$(MAKE) -C $$dir install; \ |
| 116 |
done |
| 117 |
+ $(MAKE) -C man |
| 118 |
|
| 119 |
dist: distclean |
| 120 |
[ ! -d i3-${VERSION} ] || rm -rf i3-${VERSION} |
| 121 |
--- a/man/Makefile |
| 122 |
+++ b/man/Makefile |
| 123 |
@@ -1,6 +1,8 @@ |
| 124 |
A2M:=a2x -f manpage --asciidoc-opts="-f asciidoc.conf" |
| 125 |
|
| 126 |
-all: i3.1 i3-msg.1 i3-input.1 i3-nagbar.1 i3-wsbar.1 i3-config-wizard.1 i3-migrate-config-to-v4.1 |
| 127 |
+mans=i3.1 i3-msg.1 i3-input.1 i3-nagbar.1 i3-wsbar.1 i3-config-wizard.1 i3-migrate-config-to-v4.1 |
| 128 |
+ |
| 129 |
+all: $(mans) |
| 130 |
|
| 131 |
%.1: %.man asciidoc.conf |
| 132 |
${A2M} $< |
| 133 |
@@ -16,3 +18,9 @@ |
| 134 |
|
| 135 |
distclean: clean |
| 136 |
rm -f *.1 |
| 137 |
+ |
| 138 |
+install: |
| 139 |
+ $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/share/man/man1 |
| 140 |
+ for man in $(mans); do \ |
| 141 |
+ $(INSTALL) -m 0644 $$man $(DESTDIR)$(PREFIX)/share/man/man1 |
| 142 |
+ done |
Archives