links

Commit: 0a8f82e786f0c4cca4140cad239e3711a7120378
Parent: 6c266c334de42b74842c1f709d0fbbfea1a387e7
Author: opask
Date:   Sat, 25 Aug 2018 20:18:06 -0600

update Makefile and config.mk

Diffstat:
M
Makefile
 | 
10
+++++++++-
M
config.mk
 | 
2
+-

2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
@@ -57,7 +57,15 @@ XSRC = \
 	x.c
 XOBJ = $(XSRC:.c=.o)
 
-all: linksg
+all: options linksg
+
+options:
+	@echo "CFLAGS  = $(CFLAGS)"
+	@echo "LDFLAGS = $(LDFLAGS)"
+	@echo "CC      = $(CC)"
+
+.c.o:
+	$(CC) $(CFLAGS) -c $<
 
 links: $(OBJ)
 	$(CC) -o $@ $(OBJ) $(LDFLAGS)
diff --git a/config.mk b/config.mk
@@ -10,7 +10,7 @@ INCS = -I. -I/usr/include -I$(X11INC)
 LIBS = -L$(X11LIB) -L/usr/lib -lX11 -levent -lpng -ljpeg -lcrypto -lssl -lz
 
 CPPFLAGS = -DVERSION=\"$(VERSION)\" -D_BSD_SOURCE
-CFLAGS = -O2 -std=c99 -Wall -pedantic \
+CFLAGS = -O2 -std=c99 -Wall -pedantic $(CPPFLAGS) \
 	-DG=1 \
 	-DHAVE_JPEG=1 -DHAVE_LIBJPEG=1 -DHAVE_JPEGLIB_H=1 \
 	-DHAVE_PNG_H=1 -DHAVE_LIBPNG=1 -DHAVE_LIBPNG_PNG_H=1