From 8853334bbefd57f8f9bd6bdeb0c221616b40b446 Mon Sep 17 00:00:00 2001 From: Quentin Glidic Date: Wed, 16 May 2012 16:19:12 +0200 Subject: [PATCH] New Makefile layout, move i3 to it --- Makefile | 74 +++++++++---------------------------------------------- src/i3.mk | 61 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 63 deletions(-) create mode 100644 src/i3.mk diff --git a/Makefile b/Makefile index b56f696a..c121bbdf 100644 --- a/Makefile +++ b/Makefile @@ -2,25 +2,18 @@ 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)) -FILES:=$(FILES:.c=.o) -HEADERS:=$(wildcard include/*.h) -CMDPARSE_HEADERS:=include/GENERATED_call.h include/GENERATED_enums.h include/GENERATED_tokens.h - SUBDIRS:=i3-msg i3-input i3-nagbar i3-config-wizard i3bar i3-dump-log -# Depend on the specific file (.c for each .o) and on all headers -src/%.o: src/%.c ${HEADERS} - echo "[i3] CC $<" - $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< +ALL_TARGETS = +INSTALL_TARGETS = +CLEAN_TARGETS = +DISTCLEAN_TARGETS = + +all: real-all -all: i3 subdirs +include src/i3.mk -i3: libi3/libi3.a src/cfgparse.y.o src/cfgparse.yy.o ${FILES} - echo "[i3] LINK i3" - $(CC) $(LDFLAGS) -o $@ $(filter-out libi3/libi3.a,$^) $(LIBS) +real-all: $(ALL_TARGETS) subdirs libi3/%.a: libi3/*.c $(MAKE) -C libi3 @@ -32,51 +25,7 @@ subdirs: $(MAKE) -C $$dir; \ done -# The GENERATED_* files are actually all created from a single pass, so all -# files just depend on the first one. -include/GENERATED_call.h: generate-command-parser.pl parser-specs/commands.spec - echo "[i3] Generating command parser" - (cd include; ../generate-command-parser.pl) -include/GENERATED_enums.h: include/GENERATED_call.h -include/GENERATED_tokens.h: include/GENERATED_call.h - -# This target compiles the command parser twice: -# Once with -DTEST_PARSER, creating a stand-alone executable used for tests, -# and once as an object file for i3. -src/commands_parser.o: src/commands_parser.c ${HEADERS} ${CMDPARSE_HEADERS} - echo "[i3] CC $<" - $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -DTEST_PARSER -o test.commands_parser $< $(LIBS) - $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< - -src/cfgparse.yy.o: src/cfgparse.l src/cfgparse.y.o ${HEADERS} - echo "[i3] LEX $<" - $(FLEX) -i -o$(@:.o=.c) $< - $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $(@:.o=.c) - - -src/cfgparse.y.o: src/cfgparse.y ${HEADERS} - echo "[i3] YACC $<" - $(BISON) --debug --verbose -b $(basename $< .y) -d $< - $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $(<:.y=.tab.c) - - -install: all - echo "[i3] INSTALL" - $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/bin - $(INSTALL) -d -m 0755 $(DESTDIR)$(SYSCONFDIR)/i3 - $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/include/i3 - $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/share/xsessions - $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/share/applications - $(INSTALL) -m 0755 i3 $(DESTDIR)$(PREFIX)/bin/ - $(INSTALL) -m 0755 i3-migrate-config-to-v4 $(DESTDIR)$(PREFIX)/bin/ - $(INSTALL) -m 0755 i3-sensible-editor $(DESTDIR)$(PREFIX)/bin/ - $(INSTALL) -m 0755 i3-sensible-pager $(DESTDIR)$(PREFIX)/bin/ - $(INSTALL) -m 0755 i3-sensible-terminal $(DESTDIR)$(PREFIX)/bin/ - test -e $(DESTDIR)$(SYSCONFDIR)/i3/config || $(INSTALL) -m 0644 i3.config $(DESTDIR)$(SYSCONFDIR)/i3/config - test -e $(DESTDIR)$(SYSCONFDIR)/i3/config.keycodes || $(INSTALL) -m 0644 i3.config.keycodes $(DESTDIR)$(SYSCONFDIR)/i3/config.keycodes - $(INSTALL) -m 0644 i3.xsession.desktop $(DESTDIR)$(PREFIX)/share/xsessions/i3.desktop - $(INSTALL) -m 0644 i3.applications.desktop $(DESTDIR)$(PREFIX)/share/applications/i3.desktop - $(INSTALL) -m 0644 include/i3/ipc.h $(DESTDIR)$(PREFIX)/include/i3/ +install: $(INSTALL_TARGETS) for dir in $(SUBDIRS); do \ $(MAKE) -C $$dir install; \ done @@ -106,8 +55,7 @@ dist: distclean tar cfj i3-${VERSION}.tar.bz2 i3-${VERSION} rm -rf i3-${VERSION} -clean: - rm -f src/*.o src/*.gcno src/cmdparse.* src/cfgparse.tab.{c,h} src/cfgparse.yy.c src/cfgparse.{output,dot} include/GENERATED_* +clean: $(CLEAN_TARGETS) (which lcov >/dev/null 2>&1 && lcov -d . --zerocounters) || true $(MAKE) -C libi3 clean $(MAKE) -C docs clean @@ -118,7 +66,7 @@ clean: $(MAKE) TOPDIR=$(TOPDIR) -C $$dir distclean; \ done -distclean: clean +distclean: clean $(DISTCLEAN_TARGETS) rm -f i3 for dir in $(SUBDIRS); do \ echo ""; \ diff --git a/src/i3.mk b/src/i3.mk new file mode 100644 index 00000000..f3c0193e --- /dev/null +++ b/src/i3.mk @@ -0,0 +1,61 @@ +ALL_TARGETS += i3 +INSTALL_TARGETS += install-i3 +CLEAN_TARGETS += clean-i3 + +i3_SOURCES_GENERATED = src/cfgparse.tab.c src/cfgparse.yy.c +i3_SOURCES := $(filter-out $(i3_SOURCES_GENERATED),$(wildcard src/*.c)) +i3_HEADERS_CMDPARSER := $(wildcard include/GENERATED_*.h) +i3_HEADERS := $(filter-out $(i3_HEADERS_CMDPARSER),$(wildcard include/*.h)) + +i3_OBJECTS = $(i3_SOURCES_GENERATED:.c=.o) $(i3_SOURCES:.c=.o) + +src/%.o: src/%.c $(i3_HEADERS) + echo "[i3] CC $<" + $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< + +src/cfgparse.yy.c: src/cfgparse.l src/cfgparse.tab.o $(i3_HEADERS) + echo "[i3] LEX $<" + $(FLEX) -i -o $@ $< + +src/cfgparse.tab.c: src/cfgparse.y $(i3_HEADERS) + echo "[i3] YACC $<" + $(BISON) --debug --verbose -b $(basename $< .y) -d $< + +# This target compiles the command parser twice: +# Once with -DTEST_PARSER, creating a stand-alone executable used for tests, +# and once as an object file for i3. +src/commands_parser.o: src/commands_parser.c $(i3_HEADERS) i3-command-parser.stamp + echo "[i3] CC $<" + $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -DTEST_PARSER -o test.commands_parser $< $(LIBS) + $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< + +i3-command-parser.stamp: generate-command-parser.pl parser-specs/commands.spec + echo "[i3] Generating command parser" + (cd include; ../generate-command-parser.pl) + touch $@ + +i3: libi3.a $(i3_OBJECTS) + echo "[i3] Link i3" + $(CC) $(LDFLAGS) -o $@ $(filter-out libi3.a,$^) $(LIBS) + +install-i3: i3 + echo "[i3] Install" + $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/bin + $(INSTALL) -d -m 0755 $(DESTDIR)$(SYSCONFDIR)/i3 + $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/include/i3 + $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/share/xsessions + $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/share/applications + $(INSTALL) -m 0755 i3 $(DESTDIR)$(PREFIX)/bin/ + $(INSTALL) -m 0755 i3-migrate-config-to-v4 $(DESTDIR)$(PREFIX)/bin/ + $(INSTALL) -m 0755 i3-sensible-editor $(DESTDIR)$(PREFIX)/bin/ + $(INSTALL) -m 0755 i3-sensible-pager $(DESTDIR)$(PREFIX)/bin/ + $(INSTALL) -m 0755 i3-sensible-terminal $(DESTDIR)$(PREFIX)/bin/ + test -e $(DESTDIR)$(SYSCONFDIR)/i3/config || $(INSTALL) -m 0644 i3.config $(DESTDIR)$(SYSCONFDIR)/i3/config + test -e $(DESTDIR)$(SYSCONFDIR)/i3/config.keycodes || $(INSTALL) -m 0644 i3.config.keycodes $(DESTDIR)$(SYSCONFDIR)/i3/config.keycodes + $(INSTALL) -m 0644 i3.xsession.desktop $(DESTDIR)$(PREFIX)/share/xsessions/i3.desktop + $(INSTALL) -m 0644 i3.applications.desktop $(DESTDIR)$(PREFIX)/share/applications/i3.desktop + $(INSTALL) -m 0644 include/i3/ipc.h $(DESTDIR)$(PREFIX)/include/i3/ + +clean-i3: + echo "[i3] Clean" + rm -f $(i3_OBJECTS) $(i3_SOURCES_GENERATED) $(i3_HEADERS_CMDPARSER) i3-command-parser.stamp i3 src/*.gcno src/cfgparse.{output,dot} -- 2.39.5