Implement resize command

[i3/i3] / Makefile

diff --git a/Makefile b/Makefile
index dbe56b4baf538522751b8ff1f235fbe4f6d37f6f..6e32ac4a8ca92de780d3b6d6499876047fafaa61 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,59 +1,11 @@
-UNAME=$(shell uname)
-DEBUG=1
-INSTALL=install
-MAKE=make
-GIT_VERSION=$(shell git describe --tags --always)
-VERSION=$(shell git describe --tags --abbrev=0)
+TOPDIR=$(shell pwd)
 
-CFLAGS += -std=c99
-CFLAGS += -pipe
-CFLAGS += -Wall
-CFLAGS += -Wunused
-CFLAGS += -Iinclude
-CFLAGS += -I/usr/local/include
-CFLAGS += -DI3_VERSION=\"${GIT_VERSION}\"
-
-LDFLAGS += -lm
-LDFLAGS += -lxcb-event
-LDFLAGS += -lxcb-property
-LDFLAGS += -lxcb-keysyms
-LDFLAGS += -lxcb-atom
-LDFLAGS += -lxcb-aux
-LDFLAGS += -lxcb-icccm
-LDFLAGS += -lxcb-xinerama
-LDFLAGS += -lX11
-LDFLAGS += -L/usr/local/lib -L/usr/pkg/lib
-
-ifeq ($(UNAME),NetBSD)
-# We need -idirafter instead of -I to prefer the system’s iconv over GNU libiconv
-CFLAGS += -idirafter /usr/pkg/include
-LDFLAGS += -Wl,-rpath,/usr/local/lib -Wl,-rpath,/usr/pkg/lib
-endif
-
-ifeq ($(UNAME),FreeBSD)
-LDFLAGS += -liconv
-endif
-
-ifeq ($(UNAME),Linux)
-CFLAGS += -D_GNU_SOURCE
-endif
-
-ifeq ($(DEBUG),1)
-# Extended debugging flags, macros shall be available in gcc
-CFLAGS += -gdwarf-2
-CFLAGS += -g3
-else
-CFLAGS += -O2
-endif
-
-# Don’t print command lines which are run
-.SILENT:
-
-# Always remake the following targets
-.PHONY: install clean dist distclean
+include $(TOPDIR)/common.mk
 
 # Depend on the object files of all source-files in src/*.c and on all header files
-FILES=$(patsubst %.c,%.o,$(wildcard src/*.c))
+AUTOGENERATED:=src/cfgparse.tab.c src/cfgparse.yy.c
+FILES:=$(filter-out $(AUTOGENERATED),$(wildcard src/*.c))
+FILES:=$(FILES:.c=.o)
 HEADERS=$(wildcard include/*.h)
 
 # Depend on the specific file (.c for each .o) and on all headers
@@ -61,32 +13,61 @@ src/%.o: src/%.c ${HEADERS}
        echo "CC $<"
        $(CC) $(CFLAGS) -c -o $@ $<
 
-all: ${FILES}
+all: src/cfgparse.y.o src/cfgparse.yy.o ${FILES}
        echo "LINK i3"
-       $(CC) -o i3 ${FILES} $(LDFLAGS)
+       $(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
+
+src/cfgparse.yy.o: src/cfgparse.l
+       echo "LEX $<"
+       flex -i -o$(@:.o=.c) $<
+       $(CC) $(CFLAGS) -c -o $@ $(@:.o=.c)
+
+src/cfgparse.y.o: src/cfgparse.y
+       echo "YACC $<"
+       bison --debug --verbose -b $(basename $< .y) -d $<
+       $(CC) $(CFLAGS) -c -o $@ $(<:.y=.tab.c)
 
 install: all
        echo "INSTALL"
        $(INSTALL) -d -m 0755 $(DESTDIR)/usr/bin
        $(INSTALL) -d -m 0755 $(DESTDIR)/etc/i3
+       $(INSTALL) -d -m 0755 $(DESTDIR)/usr/share/xsessions
        $(INSTALL) -m 0755 i3 $(DESTDIR)/usr/bin/
        test -e $(DESTDIR)/etc/i3/config || $(INSTALL) -m 0644 i3.config $(DESTDIR)/etc/i3/config
+       $(INSTALL) -m 0644 i3.desktop $(DESTDIR)/usr/share/xsessions/
+       $(MAKE) TOPDIR=$(TOPDIR) -C i3-msg install
+       $(MAKE) TOPDIR=$(TOPDIR) -C i3-input install
 
-dist: clean
-       [ ! -f i3-${VERSION} ] || rm -rf i3-${VERSION}
+dist: distclean
+       [ ! -d i3-${VERSION} ] || rm -rf i3-${VERSION}
        [ ! -e i3-${VERSION}.tar.bz2 ] || rm i3-${VERSION}.tar.bz2
        mkdir i3-${VERSION}
-       cp DEPENDS GOALS LICENSE PACKAGE-MAINTAINER TODO i3.config i3-${VERSION}
-       cp -r src include docs man i3-${VERSION}
-       sed -e 's/^GIT_VERSION=\(.*\)/GIT_VERSION=${GIT_VERSION}/g;s/^VERSION=\(.*\)/VERSION=${VERSION}/g' Makefile > i3-${VERSION}/Makefile
+       cp DEPENDS GOALS LICENSE PACKAGE-MAINTAINER TODO RELEASE-NOTES-${VERSION} i3.config i3.desktop pseudo-doc.doxygen Makefile i3-${VERSION}
+       cp -r src i3-msg i3-input include man i3-${VERSION}
+       # Only copy toplevel documentation (important stuff)
+       mkdir i3-${VERSION}/docs
+       find docs -maxdepth 1 -type f ! -name "*.xcf" -exec cp '{}' i3-${VERSION}/docs \;
+       sed -e 's/^GIT_VERSION=\(.*\)/GIT_VERSION=${GIT_VERSION}/g;s/^VERSION=\(.*\)/VERSION=${VERSION}/g' common.mk > i3-${VERSION}/common.mk
+       # Pre-generate a manpage to allow distributors to skip this step and save some dependencies
+       make -C man
+       cp man/i3.1 i3-${VERSION}/man/i3.1
        tar cf i3-${VERSION}.tar i3-${VERSION}
        bzip2 -9 i3-${VERSION}.tar
        rm -rf i3-${VERSION}
 
 clean:
-       rm -f src/*.o
+       rm -f src/*.o src/cfgparse.tab.{c,h} src/cfgparse.yy.c
        $(MAKE) -C docs clean
        $(MAKE) -C man clean
+       $(MAKE) TOPDIR=$(TOPDIR) -C i3-msg clean
+       $(MAKE) TOPDIR=$(TOPDIR) -C i3-input clean
 
 distclean: clean
        rm -f i3
+       $(MAKE) TOPDIR=$(TOPDIR) -C i3-msg distclean
+       $(MAKE) TOPDIR=$(TOPDIR) -C i3-input distclean