From f947d0a446b1b99020722cbc71127fc0c06086b2 Mon Sep 17 00:00:00 2001
From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 11 Oct 2009 22:11:09 +0200
Subject: Breaks configfiles! Major refactoring of i3status, see below
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We finally switched to libconfuse for a configuration file format
which does not require much work for the programmer nor for the user.
Plus, it avoids the Not-Invented-Here syndrome of yet another config
file format.

Furthermore, as a consequence of providing format strings for every
"module" (ipv6, wireless, …), we directly print the output and thus
we needed to drop support for wmii. This allowed us to get rid of
quite some complexity.

Documentation about the new configuration file and options will
follow. This commit is the beginning of what will be i3status v2.0.
---
 Makefile | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index bcbb73d..2e9f93a 100644
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,7 @@ CFLAGS+=-std=gnu99
 CFLAGS+=-pedantic
 CFLAGS+=-DPREFIX=\"\"
 CFLAGS+=-I.
+LDFLAGS+=-lconfuse
 
 VERSION=$(shell git describe --tags --abbrev=0)
 
@@ -18,9 +19,12 @@ CFLAGS+=-lbsd
 endif
 
 # Define this if you want i3status to spit out dzen2-compatible output on stdout
-#CFLAGS+=-DDZEN
+CFLAGS+=-DDZEN
 CFLAGS+=$(EXTRA_CFLAGS)
 
+OBJS:=$(wildcard src/*.c *.c)
+OBJS:=$(OBJS:.c=.o)
+
 src/%.o: src/%.c
 	@$(CC) $(CFLAGS) -c -o $@ $<
 	@echo " CC $<"
@@ -29,7 +33,7 @@ src/%.o: src/%.c
 	@$(CC) $(CFLAGS) -c -o $@ $<
 	@echo " CC $<"
 
-i3status: src/general.o src/config.o src/get_load.o src/output.o src/get_cpu_temperature.o src/process_runs.o src/get_eth_info.o src/get_ip_addr.o src/get_wireless_info.o src/get_battery_info.o src/get_ipv6_addr.o i3status.o
+i3status: ${OBJS}
 	@$(CC) -o $@ src/*.o *.o $(LDFLAGS)
 	@echo " LD $@"
 
-- 
cgit v1.2.3