1 --- openconnect-3.02/Makefile.orig 2011-05-04 18:53:39.109630396 +0200
2 +++ openconnect-3.02/Makefile 2011-05-04 17:45:05.059718203 +0200
3 @@ -15,23 +15,23 @@ endif
4 # dir; there's no need to install it anywhere (we link it statically).
6 SSL_CFLAGS += -I$(OPENSSL)/include
7 -SSL_LDFLAGS += $(OPENSSL)/libssl.a $(OPENSSL)/libcrypto.a
8 +SSL_LIBS += $(OPENSSL)/libssl.a $(OPENSSL)/libcrypto.a
10 SSL_CFLAGS += $(shell pkg-config --cflags libssl)
11 -SSL_LDFLAGS += $(shell pkg-config --libs libssl)
12 -ifeq ($(SSL_LDFLAGS),)
13 +SSL_LIBS += $(shell pkg-config --libs libssl)
15 $(error "No OpenSSL support. Cannot continue");
19 XML2_CFLAGS += $(shell xml2-config --cflags)
20 -XML2_LDFLAGS += $(shell xml2-config --libs)
21 -ifeq ($(XML2_LDFLAGS),)
22 +XML2_LIBS += $(shell xml2-config --libs)
24 $(error "No libxml2 support. Cannot continue");
27 CFLAGS := $(OPT_FLAGS) $(SSL_CFLAGS) $(XML2_CFLAGS) $(EXTRA_CFLAGS)
28 -LDFLAGS := -lz $(SSL_LDFLAGS) $(XML2_LDFLAGS) $(EXTRA_LDFLAGS)
29 +LIBS := -lz $(SSL_LIBS) $(XML2_LIBS) $(EXTRA_LIBS)
33 @@ -45,7 +45,7 @@ endif
35 ifneq ($(LIBPROXY_HDR),)
36 CFLAGS += -DOPENCONNECT_LIBPROXY -DLIBPROXY_HDR=\"$(LIBPROXY_HDR)\"
41 OPENCONNECT_OBJS := xml.o main.o $(SSL_UI)
42 @@ -68,7 +68,7 @@ version.c: $(patsubst %.o,%.c,$(VERSION_
45 openconnect: $(OPENCONNECT_OBJS) $(CONNECTION_OBJS) libopenconnect.a
46 - $(CC) -o $@ $^ $(LDFLAGS)
47 + $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
50 $(CC) -c -o $@ $(CFLAGS) $(CFLAGS_$@) $< -MD -MF .$@.dep