diff options
author | Kacper Kowalik (Xarthisius) <xarthisius.kk@gmail.com> | 2011-07-14 10:27:50 +0200 |
---|---|---|
committer | Kacper Kowalik (Xarthisius) <xarthisius.kk@gmail.com> | 2011-07-14 10:27:50 +0200 |
commit | c29b460f61bc5f2b914cd4d73c2069269a0647ea (patch) | |
tree | 7112b5e2b193c13b0f555eb3946690718f878a62 /x11-wm/i3/files/i3-9999-build.patch | |
parent | [x11-wm/i3] add live ebuild from sunrise (diff) | |
download | xarthisius-c29b460f61bc5f2b914cd4d73c2069269a0647ea.tar.gz xarthisius-c29b460f61bc5f2b914cd4d73c2069269a0647ea.tar.bz2 xarthisius-c29b460f61bc5f2b914cd4d73c2069269a0647ea.zip |
Use tree branch
Diffstat (limited to 'x11-wm/i3/files/i3-9999-build.patch')
-rw-r--r-- | x11-wm/i3/files/i3-9999-build.patch | 113 |
1 files changed, 113 insertions, 0 deletions
diff --git a/x11-wm/i3/files/i3-9999-build.patch b/x11-wm/i3/files/i3-9999-build.patch new file mode 100644 index 0000000..6c13460 --- /dev/null +++ b/x11-wm/i3/files/i3-9999-build.patch @@ -0,0 +1,113 @@ +diff --git a/Makefile b/Makefile +index 10af73b..b96e64e 100644 +--- a/Makefile ++++ b/Makefile +@@ -18,14 +18,22 @@ else + UNUSED:=$(shell $(MAKE) loglevels.h) + endif + ++SUBDIRS=i3-msg i3-input i3-nagbar i3-config-wizard ++ + # Depend on the specific file (.c for each .o) and on all headers + src/%.o: src/%.c ${HEADERS} + echo "CC $<" + $(CC) $(CPPFLAGS) $(CFLAGS) -DLOGLEVEL="((uint64_t)1 << $(shell awk '/$(shell basename $< .c)/ { print NR; exit 0; }' loglevels.tmp))" -c -o $@ $< + +-all: src/cfgparse.y.o src/cfgparse.yy.o src/cmdparse.y.o src/cmdparse.yy.o ${FILES} +- echo "LINK i3" +- $(CC) $(LDFLAGS) -o i3 $^ $(LIBS) ++all: i3 subdirs ++ ++i3: src/cfgparse.y.o src/cfgparse.yy.o src/cmdparse.y.o src/cmdparse.yy.o ${FILES} ++ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) ++ ++subdirs: ++ for dir in $(SUBDIRS); do \ ++ $(MAKE) -C $$dir; \ ++ done + + loglevels.h: + echo "LOGLEVELS" +@@ -74,10 +82,9 @@ install: all + $(INSTALL) -m 0644 i3.welcome $(DESTDIR)$(SYSCONFDIR)/i3/welcome + $(INSTALL) -m 0644 i3.desktop $(DESTDIR)$(PREFIX)/share/xsessions/ + $(INSTALL) -m 0644 include/i3/ipc.h $(DESTDIR)$(PREFIX)/include/i3/ +- $(MAKE) TOPDIR=$(TOPDIR) -C i3-msg install +- $(MAKE) TOPDIR=$(TOPDIR) -C i3-input install +- $(MAKE) TOPDIR=$(TOPDIR) -C i3-nagbar install +- $(MAKE) TOPDIR=$(TOPDIR) -C i3-config-wizard install ++ for dir in $(SUBDIRS); do \ ++ $(MAKE) -C $$dir install; \ ++ done + + dist: distclean + [ ! -d i3-${VERSION} ] || rm -rf i3-${VERSION} +diff --git a/i3-config-wizard/Makefile b/i3-config-wizard/Makefile +index 688df11..690fc0f 100644 +--- a/i3-config-wizard/Makefile ++++ b/i3-config-wizard/Makefile +@@ -13,9 +13,11 @@ HEADERS:=$(wildcard *.h) + echo "CC $<" + $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< + +-all: cfgparse.y.o cfgparse.yy.o ${FILES} ++all: i3-config-wizard ++ ++i3-config-wizard: cfgparse.y.o cfgparse.yy.o ${FILES} + echo "LINK i3-config-wizard" +- $(CC) $(LDFLAGS) -o i3-config-wizard $^ $(LIBS) ++ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) + + cfgparse.yy.o: cfgparse.l cfgparse.y.o ${HEADERS} + echo "LEX $<" +diff --git a/i3-input/Makefile b/i3-input/Makefile +index 498cfb5..45653da 100644 +--- a/i3-input/Makefile ++++ b/i3-input/Makefile +@@ -12,9 +12,11 @@ HEADERS=$(wildcard *.h) + echo "CC $<" + $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< + +-all: ${FILES} ++all: i3-input ++ ++i3-input: ${FILES} + echo "LINK i3-input" +- $(CC) $(LDFLAGS) -o i3-input ${FILES} $(LIBS) ++ $(CC) $(LDFLAGS) -o $@ ${FILES} $(LIBS) + + install: all + echo "INSTALL" +diff --git a/i3-msg/Makefile b/i3-msg/Makefile +index 7ea19e6..1b7c1c0 100644 +--- a/i3-msg/Makefile ++++ b/i3-msg/Makefile +@@ -14,7 +14,9 @@ HEADERS=$(wildcard *.h) + echo "CC $<" + $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< + +-all: ${FILES} ++all: i3-msg ++ ++i3-msg: ${FILES} + echo "LINK i3-msg" + $(CC) $(LDFLAGS) -o i3-msg ${FILES} $(LIBS) + +diff --git a/i3-nagbar/Makefile b/i3-nagbar/Makefile +index c9eec44..933ae76 100644 +--- a/i3-nagbar/Makefile ++++ b/i3-nagbar/Makefile +@@ -12,9 +12,11 @@ HEADERS=$(wildcard *.h) + echo "CC $<" + $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< + +-all: ${FILES} ++all: i3-nagbar ++ ++i3-nagbar: ${FILES} + echo "LINK i3-nagbar" +- $(CC) $(LDFLAGS) -o i3-nagbar ${FILES} $(LIBS) ++ $(CC) $(LDFLAGS) -o $@ ${FILES} $(LIBS) + + install: all + echo "INSTALL" |