[Pkg-wmaker-commits] [wmsysmon] 04/13: Delete automatic stripping of binary; use LIBS instead of LDFLAGS.

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch upstream
in repository wmsysmon.

commit d7985a77eef3429fd309547790feec020421de0b
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date:   Fri Jul 17 09:59:12 2015 -0600

    Delete automatic stripping of binary; use LIBS instead of LDFLAGS.
    
    Also use pkg-config for LIBS and CFLAGS.
    
    Based in part on a patch by Luca Bedogni <me at lucabedogni.it>.
    
    Origin: https://sources.debian.net/src/wmsysmon/0.7.7-8/debian/patches/makefile-strip.patch/
---
 src/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index d97f077..5e345f2 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -2,16 +2,16 @@ CC = gcc
 PREFIX ?= /usr/local
 
 LIBDIR += -L/usr/X11R6/lib
-LDFLAGS += -lXpm -lXext -lX11 -lm -s
+LIBS = $(shell pkg-config --libs xpm xext x11) -lm
 #CFLAGS = -g #-DMONDEBUG
-CFLAGS += -Wall -O3 -fomit-frame-pointer -I/usr/X11R6/include #-DHI_INTS #undefine HI_INTS if your x86 SMP or alpha
+CFLAGS += -Wall -O3 -fomit-frame-pointer $(shell pkg-config --cflags xpm xext x11) #-DHI_INTS #undefine HI_INTS if your x86 SMP or alpha
 
 BIN = wmsysmon
 OBJS =	wmgeneral.o \
 	wmsysmon.o
 
 $(BIN): $(OBJS)
-	$(CC) -o $(BIN) $(OBJS) $(LIBDIR) $(LDFLAGS)
+	$(CC) $(LDFLAGS) -o $(BIN) $(OBJS) $(LIBDIR) $(LIBS)
 
 all: wmsysmon
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmsysmon.git