From fca9ec4b5c49c03eedf6393d2e20ca6b64b6163a Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Mon, 8 Feb 2021 00:14:18 -0700 Subject: patch Makefile for .deb builds --- Makefile | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/Makefile b/Makefile index bc6e45c..ccd0332 100644 --- a/Makefile +++ b/Makefile @@ -1,31 +1,31 @@ -# With GIT Integration -#CC=gcc -Wall -O3 -DWFMGIT -#LD=-lgit2 -lpthread +LDFLAGS += -Wl,-z,muldefs -# Without GIT Integration -CC=gcc -Wall -O3 -LD= +all: wfm.cgi wfm_git.cgi -OB=wfm.o dir.o dialogs.o fileio.o cgic.o md5.o urlencode.o git.o +wfm.cgi: wfm.o dir.o dialogs.o fileio.o cgic.o md5.o urlencode.o git_nogit.o + $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $^ $(LDFLAGS) -all: wfm +wfm_git.cgi: wfm.o dir.o dialogs.o fileio.o cgic.o md5.o urlencode.o git_git.o + $(CC) $(CPPFLAGS) -DWFMGIT $(CFLAGS) -o $@ $^ $(LDFLAGS) -lgit2 -lpthread -wfm: ${OB} - ${CC} ${OB} -o wfm ${LD} - @strip wfm - @du -h wfm +wfm.h: wfmiconres.h -wfm.o: wfm.c wfmiconres.h wfm.h +dir.o: dir.c wfm.h +dialogs.o: dialogs.c wfm.h +wfm.o: wfm.c wfm.h +fileio.o: fileio.c wfm.h + +git_nogit.o: git.c wfm.h + $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< + +git_git.o: git.c wfm.h + $(CC) $(CPPFLAGS) -DWFMGIT $(CFLAGS) -c -o $@ $< wfmiconres.h: bin2c sh ./mkicons.sh bin2c: bin2c.c - ${CC} -o bin2c bin2c.c - -.c.o: - ${CC} -c $< + $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $^ $(LDFLAGS) clean: - rm -f *.o wfm wfmicon*.h bin2c - + rm -f *.o *.cgi wfmicon*.h bin2c -- cgit v1.2.3