Testcases: rename StartXDummy to StartXServer

[i3/i3] / i3bar / Makefile

diff --git a/i3bar/Makefile b/i3bar/Makefile
index 753ee4d691e69effdc0e70d030b12cbbe75029d1..cd23cd819cfe66711303b95c91e32e74f6bcc726 100644 (file)
--- a/i3bar/Makefile
+++ b/i3bar/Makefile
@@ -1,42 +1,10 @@
-TOPDIR=..
+all:
+       $(MAKE) -C .. i3bar/i3bar
 
-include $(TOPDIR)/common.mk
-
-FILES:=$(wildcard src/*.c)
-FILES:=$(FILES:.c=.o)
-HEADERS:=$(wildcard include/*.h)
-
-CPPFLAGS += -I$(TOPDIR)/include
-
-all: i3bar doc
-
-i3bar: $(TOPDIR)/libi3/libi3.a ${FILES}
-       echo "[i3bar] LINK"
-       $(CC) $(LDFLAGS) -o $@ $(filter-out libi3/libi3.a,$^) $(LIBS)
-
-libi3/%.a:
-       $(MAKE) -C $(TOPDIR)/libi3
-
-doc:
-       echo ""
-       echo "[i3bar] SUBDIR doc"
-       $(MAKE) -C doc
-
-src/%.o: src/%.c ${HEADERS}
-       echo "[i3bar] CC $<"
-       $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
-
-install: all
-       echo "[i3bar] INSTALL"
-       $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/bin
-       $(INSTALL) -m 0755 i3bar $(DESTDIR)$(PREFIX)/bin
+install:
+       $(MAKE) -C .. install-i3bar
 
 clean:
-       rm -f src/*.o
-       $(MAKE) -C doc clean
-
-distclean: clean
-       rm -f i3bar
-       $(MAKE) -C doc distclean
+       $(MAKE) -C .. clean-i3bar
 
-.PHONY: install clean distclean doc
+.PHONY: all install clean