|
@@ -1,21 +1,35 @@
|
|
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
|
|
+--- libcli-1.9.7.orig/Makefile 2013-12-21 13:33:31.000000000 +0100
|
|
---- libcli-1.9.4.orig/Makefile 2008-10-09 04:38:01.000000000 +0200
|
|
++++ libcli-1.9.7/Makefile 2013-12-21 13:37:09.000000000 +0100
|
|
-+++ libcli-1.9.4/Makefile 2009-05-29 17:42:04.310095050 +0200
|
|
+@@ -1,6 +1,5 @@
|
|
-@@ -1,15 +1,12 @@
|
|
+-UNAME = $(shell sh -c 'uname -s 2>/dev/null || echo not')
|
|
DESTDIR =
|
|
DESTDIR =
|
|
-PREFIX = /usr/local
|
|
-PREFIX = /usr/local
|
|
+PREFIX = /usr
|
|
+PREFIX = /usr
|
|
|
|
|
|
MAJOR = 1
|
|
MAJOR = 1
|
|
MINOR = 9
|
|
MINOR = 9
|
|
- REVISION = 3
|
|
+@@ -8,21 +7,15 @@ REVISION = 7
|
|
LIB = libcli.so
|
|
LIB = libcli.so
|
|
|
|
+ LIB_STATIC = libcli.a
|
|
|
|
|
|
-CC = gcc
|
|
-CC = gcc
|
|
|
|
+-AR = ar
|
|
|
|
++CC ?= gcc
|
|
|
|
++AR ?= ar
|
|
|
|
+ ARFLAGS = rcs
|
|
-DEBUG = -g
|
|
-DEBUG = -g
|
|
-OPTIM = -O3
|
|
-OPTIM = -O3
|
|
--CFLAGS += $(DEBUG) $(OPTIM) -Wall -Wformat-security -Wno-format-zero-length
|
|
+-CFLAGS += $(DEBUG) $(OPTIM) -Wall -std=c99 -pedantic -Wformat-security -Wno-format-zero-length -Werror -Wwrite-strings -Wformat -fdiagnostics-show-option -Wextra -Wsign-compare -Wcast-align -Wno-unused-parameter
|
|
-+CFLAGS += -Wall -Wformat-security -Wno-format-zero-length
|
|
++CFLAGS += -Wall -std=c99 -pedantic -Wformat-security -Wno-format-zero-length -Werror -Wwrite-strings -Wformat -fdiagnostics-show-option -Wextra -Wsign-compare -Wcast-align -Wno-unused-parameter
|
|
- LDFLAGS += -shared -Wl,-soname,$(LIB).$(MAJOR).$(MINOR)
|
|
+ LDFLAGS += -shared
|
|
LIBPATH += -L.
|
|
LIBPATH += -L.
|
|
|
|
+
|
|
|
|
+-ifeq ($(UNAME),Darwin)
|
|
|
|
+-LDFLAGS += -Wl,-install_name,$(LIB).$(MAJOR).$(MINOR)
|
|
|
|
+-else
|
|
|
|
+ LDFLAGS += -Wl,-soname,$(LIB).$(MAJOR).$(MINOR)
|
|
LIBS = -lcrypt
|
|
LIBS = -lcrypt
|
|
|
|
+-endif
|
|
|
|
+
|
|
|
|
+ all: $(LIB) $(LIB_STATIC) clitest
|
|
|
|
+
|