--- cntlm-0.92.orig/Makefile 2011-10-14 06:45:26.000000000 -0500
+++ cntlm-0.92/Makefile 2011-12-05 16:30:44.068746335 -0600
@@ -16,39 +16,31 @@
CC=gcc
VER=`cat VERSION`
OBJS=utils.o ntlm.o xcrypt.o config.o socket.o acl.o auth.o http.o forward.o direct.o scanner.o pages.o main.o
-CFLAGS=$(FLAGS) -std=c99 -Wall -pedantic -O3 -D__BSD_VISIBLE -D_ALL_SOURCE -D_XOPEN_SOURCE=600 -D_POSIX_C_SOURCE=200112 -D_ISOC99_SOURCE -D_REENTRANT -D_BSD_SOURCE -DVERSION=\"`cat VERSION`\"
-OS=$(shell uname -s)
-OSLDFLAGS=$(shell [ $(OS) = "SunOS" ] && echo "-lrt -lsocket -lnsl")
-LDFLAGS:=-lpthread $(OSLDFLAGS)
+MYFLAGS=-std=c99 -pedantic -D__BSD_VISIBLE -D_ALL_SOURCE -D_XOPEN_SOURCE=600 -D_POSIX_C_SOURCE=200112 -D_ISOC99_SOURCE -D_REENTRANT -D_BSD_SOURCE -DVERSION=\"`cat VERSION`\"
+MYLDFLAGS:=-lpthread
$(NAME): configure-stamp $(OBJS)
@echo "Linking $@"
- @$(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS)
+ @$(CC) $(CFLAGS) $(MYFLAGS) -o $@ $(OBJS) $(LDFLAGS) $(MYLDFLAGS)
main.o: main.c
@echo "Compiling $<"
@if [ -z "$(SYSCONFDIR)" ]; then \
- $(CC) $(CFLAGS) -c main.c -o $@; \
+ $(CC) $(CFLAGS) $(MYFLAGS) -c main.c -o $@; \
else \
- $(CC) $(CFLAGS) -DSYSCONFDIR=\"$(SYSCONFDIR)\" -c main.c -o $@; \
+ $(CC) $(CFLAGS) $(MYFLAGS) -DSYSCONFDIR=\"$(SYSCONFDIR)\" -c main.c -o $@; \
fi
.c.o:
@echo "Compiling $<"
- @$(CC) $(CFLAGS) -c -o $@ $<
+ @echo "CFLAGS=$(CFLAGS)"
+ @$(CC) $(CFLAGS) $(MYFLAGS) -c -o $@ $<
install: $(NAME)
- # AIX?
- if [ -f /usr/bin/oslevel ]; then \
- install -M 755 -S -f $(BINDIR) $(NAME); \
- install -M 644 -f $(MANDIR)/man1 doc/$(NAME).1; \
- install -M 600 -c $(SYSCONFDIR) doc/$(NAME).conf; \
- else \
- install -D -m 755 -s $(NAME) $(BINDIR)/$(NAME); \
- install -D -m 644 doc/$(NAME).1 $(MANDIR)/man1/$(NAME).1; \
- [ -f $(SYSCONFDIR)/$(NAME).conf -o -z "$(SYSCONFDIR)" ] \
- || install -D -m 600 doc/$(NAME).conf $(SYSCONFDIR)/$(NAME).conf; \
- fi
+ install -D -m 755 $(NAME) $(BINDIR)/$(NAME); \
+ install -D -m 644 doc/$(NAME).1 $(MANDIR)/man1/$(NAME).1; \
+ [ -f $(SYSCONFDIR)/$(NAME).conf -o -z "$(SYSCONFDIR)" ] \
+ || install -D -m 600 doc/$(NAME).conf $(SYSCONFDIR)/$(NAME).conf;
@echo; echo "Cntlm will look for configuration in $(SYSCONFDIR)/$(NAME).conf"
tgz: