--- a/cntlm/Makefile +++ b/cntlm/Makefile @@ -15,7 +15,7 @@ MANDIR=$(DESTDIR)/usr/share/man NAME=cntlm CC=gcc VER=`cat VERSION` -CFLAGS+=$(FLAGS) -std=c99 -Wall -Wno-unused-but-set-variable -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`\" +CFLAGS+=$(FLAGS) -std=c99 -Wall -Wno-unused-but-set-variable -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 -D_DEFAULT_SOURCE -DVERSION=\"`cat VERSION`\" OS=$(shell uname -s) OSLDFLAGS=$(shell [ $(OS) = "SunOS" ] && echo "-lrt -lsocket -lnsl") LDFLAGS:=-lpthread $(OSLDFLAGS) @@ -28,11 +28,11 @@ endif $(NAME): configure-stamp $(OBJS) @echo "Linking $@" - @$(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS) + $(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS) main.o: main.c @echo "Compiling $<" - @if [ -z "$(SYSCONFDIR)" ]; then \ + if [ -z "$(SYSCONFDIR)" ]; then \ $(CC) $(CFLAGS) -c main.c -o $@; \ else \ $(CC) $(CFLAGS) -DSYSCONFDIR=\"$(SYSCONFDIR)\" -c main.c -o $@; \ @@ -40,7 +40,7 @@ main.o: main.c .c.o: @echo "Compiling $<" - @$(CC) $(CFLAGS) -c -o $@ $< + $(CC) $(CFLAGS) -c -o $@ $< install: $(NAME) # Special handling for install(1) @@ -49,12 +49,12 @@ install: $(NAME) install -M 644 -f $(MANDIR)/man1 doc/$(NAME).1; \ install -M 600 -c $(SYSCONFDIR) doc/$(NAME).conf; \ elif [ "`uname -s`" = "Darwin" ]; then \ - install -d -m 755 -s $(NAME) $(BINDIR)/$(NAME); \ + 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; \ else \ - install -D -m 755 -s $(NAME) $(BINDIR)/$(NAME); \ + 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; \