Merge branch 'refs/heads/t/im-logo'

[dss.git] / Makefile

diff --git a/Makefile b/Makefile
index d27b9cd3bb686d05269d8024c19743970538aabd..f5c34af7b590145c99d3a8ced9b2badfd7179048 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,9 @@ dss_objects := dss.o str.o file.o exec.o sig.o daemon.o df.o tv.o snap.o ipc.o d
 all: dss dss.1
 man: dss.1
 
+DSS_CPPFLAGS := -DVERSION_STRING='"$(VERSION_STRING)"'
+DSS_CPPFLAGS += -Wunused-macros
+
 DSS_CFLAGS := -Wno-sign-compare -g -Wunused -Wundef
 DSS_CFLAGS += -Wredundant-decls
 DSS_CFLAGS += -Os
@@ -19,13 +22,12 @@ DSS_CFLAGS += -Wchar-subscripts
 DSS_CFLAGS += -Wformat-security
 DSS_CFLAGS += -Werror-implicit-function-declaration
 DSS_CFLAGS += -Wmissing-format-attribute
-DSS_CFLAGS += -Wunused-macros
 DSS_CFLAGS += -Wunused-parameter
 DSS_CFLAGS += -Wbad-function-cast
 DSS_CFLAGS += -Wshadow
 
 Makefile.deps: $(wildcard *.c *.h)
-       $(CC) -MM -MG $(DSS_CFLAGS) $(CFLAGS) *.c > $@
+       $(CC) -MM -MG $(DSS_CPPFLAGS) $(CPPFLAGS) $(DSS_CFLAGS) $(CFLAGS) *.c > $@
 
 -include Makefile.deps
 
@@ -33,10 +35,10 @@ dss: $(dss_objects)
        $(CC) -o $@ $(dss_objects) $(LDFLAGS) -llopsub
 
 %.o: %.c Makefile
-       $(CC) -c -DVERSION_STRING='"$(VERSION_STRING)"' $(DSS_CFLAGS) $(CFLAGS) $<
+       $(CC) -c $(DSS_CPPFLAGS) $(CPPFLAGS) $(DSS_CFLAGS) $(CFLAGS) $<
 
-%.png: %.dia
-       dia -e $@ -t png $<
+dss.png: mklogo
+       ./mklogo > $@
 
 %.lsg.h: %.suite
        lopsubgen --gen-h=$@ < $<