move match_* to match.c

[i3/i3] / Makefile

diff --git a/Makefile b/Makefile
index c73723ade6d3a8391960da54a7548735289af1b8..93c98e1e6d01456804fd31fe9b132c732639b311 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,8 +3,8 @@ TOPDIR=$(shell pwd)
 include $(TOPDIR)/common.mk
 
 # Depend on the object files of all source-files in src/*.c and on all header files
-AUTOGENERATED:=src/cfgparse.tab.c src/cfgparse.yy.c
-FILES:=$(filter-out $(AUTOGENERATED),$(wildcard src/*.c))
+AUTOGENERATED:=src/cfgparse.tab.c src/cfgparse.yy.c src/cmdparse.tab.c src/cmdparse.yy.c
+FILES:=src/ipc.c src/nc.c src/log.c src/util.c src/tree.c src/xcb.c src/manage.c src/workspace.c src/x.c src/floating.c src/click.c src/config.c src/handlers.c src/randr.c src/xinerama.c src/con.c src/load_layout.c src/render.c src/window.c src/match.c
 FILES:=$(FILES:.c=.o)
 HEADERS:=$(filter-out include/loglevels.h,$(wildcard include/*.h))
 
@@ -13,7 +13,7 @@ HEADERS:=$(filter-out include/loglevels.h,$(wildcard include/*.h))
 # updated if necessary, but we also want to save rebuilds of the object
 # files, so we cannot let the object files depend on loglevels.h.
 ifeq ($(MAKECMDGOALS),loglevels.h)
-UNUSED:=$(warning Generating loglevels.h)
+#UNUSED:=$(warning Generating loglevels.h)
 else
 UNUSED:=$(shell $(MAKE) loglevels.h)
 endif
@@ -23,14 +23,9 @@ src/%.o: src/%.c ${HEADERS}
        echo "CC $<"
        $(CC) $(CFLAGS) -DLOGLEVEL="(1 << $(shell awk '/$(shell basename $< .c)/ { print NR }' loglevels.tmp))" -c -o $@ $<
 
-all: src/cfgparse.y.o src/cfgparse.yy.o ${FILES}
+all: src/cfgparse.y.o src/cfgparse.yy.o src/cmdparse.y.o src/cmdparse.yy.o ${FILES}
        echo "LINK i3"
-       $(CC) -o i3 ${FILES} src/cfgparse.y.o src/cfgparse.yy.o $(LDFLAGS)
-       echo ""
-       echo "SUBDIR i3-msg"
-       $(MAKE) TOPDIR=$(TOPDIR) -C i3-msg
-       echo "SUBDIR i3-input"
-       $(MAKE) TOPDIR=$(TOPDIR) -C i3-input
+       $(CC) -o i3 $^ $(LDFLAGS)
 
 loglevels.h:
        echo "LOGLEVELS"
@@ -49,11 +44,23 @@ src/cfgparse.yy.o: src/cfgparse.l src/cfgparse.y.o ${HEADERS}
        flex -i -o$(@:.o=.c) $<
        $(CC) $(CFLAGS) -DLOGLEVEL="(1 << $(shell awk '/cfgparse.l/ { print NR }' loglevels.tmp))" -c -o $@ $(@:.o=.c)
 
+src/cmdparse.yy.o: src/cmdparse.l src/cmdparse.y.o ${HEADERS}
+       echo "LEX $<"
+       flex -P cmdyy -i -o$(@:.o=.c) $<
+       $(CC) $(CFLAGS) -DLOGLEVEL="(1 << $(shell awk '/cmdparse.l/ { print NR }' loglevels.tmp))" -c -o $@ $(@:.o=.c)
+
+
 src/cfgparse.y.o: src/cfgparse.y ${HEADERS}
        echo "YACC $<"
        bison --debug --verbose -b $(basename $< .y) -d $<
        $(CC) $(CFLAGS) -DLOGLEVEL="(1 << $(shell awk '/cfgparse.y/ { print NR }' loglevels.tmp))" -c -o $@ $(<:.y=.tab.c)
 
+src/cmdparse.y.o: src/cmdparse.y ${HEADERS}
+       echo "YACC $<"
+       bison -p cmdyy --debug --verbose -b $(basename $< .y) -d $<
+       $(CC) $(CFLAGS) -DLOGLEVEL="(1 << $(shell awk '/cmdparse.y/ { print NR }' loglevels.tmp))" -c -o $@ $(<:.y=.tab.c)
+
+
 install: all
        echo "INSTALL"
        $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/bin