30 lines
732 B
Diff
30 lines
732 B
Diff
--- Makefile.orig
|
|
+++ Makefile
|
|
@@ -12,14 +12,14 @@
|
|
CC = gcc
|
|
LD = $(CC)
|
|
|
|
-CPPFLAGS += -D'__VERSION="$(shell git describe --all --long --always)"' "-I$(IDIR)"
|
|
+CPPFLAGS += "-I$(IDIR)"
|
|
|
|
CFLAGS += -std=gnu99
|
|
CFLAGS += -Wall -Wundef -Wshadow -Wformat-security
|
|
|
|
-LDFLAGS += $(shell pkg-config --libs x11 xi xfixes)
|
|
+LIBS += $(shell pkg-config --libs x11 xi xfixes)
|
|
# libev has no pkg-config support
|
|
-LDFLAGS += -lev
|
|
+LIBS += -lev
|
|
|
|
INCS = $(wildcard $(IDIR)/*.h)
|
|
SRCS = $(wildcard $(SDIR)/*.c)
|
|
@@ -34,7 +34,7 @@
|
|
|
|
.PHONY: $(TARGET)
|
|
$(TARGET): $(OBJS)
|
|
- $(LD) $(OBJS) $(LDFLAGS) -o "$(TARGET)"
|
|
+ $(CC) $(LDFLAGS) -o "$(TARGET)" $(OBJS) $(LIBS)
|
|
|
|
$(ODIR)/%.o: $(SDIR)/%.c $(INCS)
|
|
$(CC) $(CPPFLAGS) $(CFLAGS) -o "$@" -c "$<"
|