1 Misc. Makefile cleanup and fix the VERSION definition.
3 Signed-off-by: Samuel Martin <s.martin49@gmail.com>
6 diff -purN vpnc-0.5.3.orig/Makefile vpnc-0.5.3/Makefile
7 --- vpnc-0.5.3.orig/Makefile 2012-08-06 00:03:22.677914146 +0200
8 +++ vpnc-0.5.3/Makefile 2012-08-06 00:06:58.506744901 +0200
11 # $Id: Makefile 312 2008-06-15 18:09:42Z Joerg Mayer $
17 -SBINDIR=$(PREFIX)/sbin
18 -MANDIR=$(PREFIX)/share/man
19 -DOCDIR=$(PREFIX)/share/doc/vpnc
21 -SRCS = sysdep.c vpnc-debug.c isakmp-pkt.c tunip.c config.c dh.c math_group.c supp.c decrypt-utils.c
22 -BINS = vpnc cisco-decrypt
23 -OBJS = $(addsuffix .o,$(basename $(SRCS)))
27 +BINDIR = $(PREFIX)/bin
28 +SBINDIR = $(PREFIX)/sbin
29 +MANDIR = $(PREFIX)/share/man
30 +DOCDIR = $(PREFIX)/share/doc/vpnc
32 +SRCS = sysdep.c vpnc-debug.c isakmp-pkt.c tunip.c config.c dh.c math_group.c supp.c decrypt-utils.c
33 +BINS = vpnc cisco-decrypt
34 +OBJS = $(addsuffix .o,$(basename $(SRCS)))
35 BINOBJS = $(addsuffix .o,$(BINS))
36 BINSRCS = $(addsuffix .c,$(BINS))
37 -VERSION := $(shell sh mk-version)
38 -RELEASE_VERSION := $(shell cat VERSION)
40 # The license of vpnc (Gpl >= 2) is quite likely incompatible with the
41 # openssl license. Openssl is currently used to provide certificate
42 @@ -50,13 +48,13 @@ RELEASE_VERSION := $(shell cat VERSION)
43 #OPENSSL_GPL_VIOLATION = -DOPENSSL_GPL_VIOLATION
44 #OPENSSLLIBS = -lcrypto
48 -CFLAGS += -W -Wall -Wmissing-declarations -Wwrite-strings
49 -CFLAGS += $(shell libgcrypt-config --cflags)
50 -CPPFLAGS += -DVERSION=\"$(VERSION)\" $(OPENSSL_GPL_VIOLATION)
52 -LDFLAGS += $(shell libgcrypt-config --libs) $(OPENSSLLIBS)
55 +CFLAGS += -W -Wall -Wmissing-declarations -Wwrite-strings
56 +CFLAGS += $(shell libgcrypt-config --cflags)
57 +CPPFLAGS += $(OPENSSL_GPL_VIOLATION)
59 +LDFLAGS += $(shell libgcrypt-config --libs) $(OPENSSLLIBS)
61 ifeq ($(shell uname -s), SunOS)
62 LDFLAGS += -lnsl -lresolv -lsocket
63 @@ -84,7 +82,7 @@ cisco-decrypt : cisco-decrypt.o decrypt-
64 $(CC) -o $@ $^ $(LDFLAGS)
66 .depend: $(SRCS) $(BINSRCS)
67 - $(CC) -MM $(SRCS) $(BINSRCS) $(CFLAGS) $(CPPFLAGS) > $@
68 + $(CC) -MM $(SRCS) $(BINSRCS) $(CPPFLAGS) $(CFLAGS) > $@
70 vpnc-debug.c vpnc-debug.h : isakmp.h enum2debug.pl
71 LC_ALL=C perl -w ./enum2debug.pl isakmp.h >vpnc-debug.c 2>vpnc-debug.h