- add missing dependency on libgcrypt

Ulf, this should be updated to 0.5.1
This commit is contained in:
Bernhard Reutner-Fischer 2007-09-19 10:30:02 +00:00
parent 595e070364
commit 23ce501c7a
2 changed files with 6 additions and 23 deletions

View File

@ -1,12 +0,0 @@
diff -urN vpnc-0.4.0-0rig/Makefile vpnc-0.4.0/Makefile
--- vpnc-0.4.0-0rig/Makefile 2007-02-19 21:51:12.000000000 +0100
+++ vpnc-0.4.0/Makefile 2007-07-17 19:59:53.000000000 +0200
@@ -35,7 +35,7 @@
RELEASE_VERSION := $(shell cat VERSION)
CC=gcc
-CFLAGS += -W -Wall -O3 -Wmissing-declarations -Wwrite-strings -g
+CFLAGS += -W -Wall -O3 -Wmissing-declarations -Wwrite-strings -g -I$(INCLUDE)
CPPFLAGS = -DVERSION=\"$(VERSION)\"
LDFLAGS = -g $(shell libgcrypt-config --libs)
CFLAGS += $(shell libgcrypt-config --cflags)

View File

@ -20,15 +20,12 @@ $(DL_DIR)/$(VPNC_SOURCE):
$(VPNC_DIR)/.unpacked: $(DL_DIR)/$(VPNC_SOURCE) $(VPNC_DIR)/.unpacked: $(DL_DIR)/$(VPNC_SOURCE)
$(VPNC_CAT) $(DL_DIR)/$(VPNC_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - $(VPNC_CAT) $(DL_DIR)/$(VPNC_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh $(VPNC_DIR) package/vpnc \*.patch toolchain/patch-kernel.sh $(VPNC_DIR) package/vpnc \*.patch
touch $(VPNC_DIR)/.unpacked touch $@
$(VPNC_DIR)/.configured: $(VPNC_DIR)/.unpacked $(VPNC_BINARY): $(VPNC_DIR)/.unpacked
touch $(VPNC_DIR)/.configured
$(VPNC_BINARY): $(VPNC_DIR)/.configured
rm -f $@ rm -f $@
$(MAKE) $(TARGET_CONFIGURE_OPTS) INCLUDE=$(STAGING_DIR)/usr/include \ $(MAKE) $(TARGET_CONFIGURE_OPTS) INCLUDE=$(STAGING_DIR)/usr/include \
CC=$(TARGET_CC) -C $(VPNC_DIR) CC="$(TARGET_CC)" -C $(VPNC_DIR)
$(VPNC_TARGET_BINARY): $(VPNC_BINARY) $(VPNC_TARGET_BINARY): $(VPNC_BINARY)
$(MAKE) $(TARGET_CONFIGURE_OPTS) \ $(MAKE) $(TARGET_CONFIGURE_OPTS) \
@ -39,18 +36,16 @@ $(VPNC_TARGET_BINARY): $(VPNC_BINARY)
MANDIR=/usr/share/man \ MANDIR=/usr/share/man \
VERSION=$(VPNC_VERSION) \ VERSION=$(VPNC_VERSION) \
INCLUDE=$(STAGING_DIR)/usr/include \ INCLUDE=$(STAGING_DIR)/usr/include \
LDFLAGS="-g -lgcrypt -lgpg-error" \ LDFLAGS="-lgcrypt -lgpg-error" \
-C $(VPNC_DIR) install -C $(VPNC_DIR) install
$(STRIP) $(STRIP_STRIP_UNNEEDED) $(VPNC_TARGET_BINARY) $(STRIP) $(STRIP_STRIP_UNNEEDED) $(VPNC_TARGET_BINARY)
vpnc: uclibc $(VPNC_TARGET_BINARY) vpnc: uclibc libgcrypt $(VPNC_TARGET_BINARY)
vpnc-source: $(DL_DIR)/$(VPNC_SOURCE) vpnc-source: $(DL_DIR)/$(VPNC_SOURCE)
vpnc-clean: vpnc-clean:
@if [ -d $(VPNC_DIR)/Makefile ]; then \ -$(MAKE) -C $(VPNC_DIR) clean
$(MAKE) -C $(VPNC_DIR) clean; \
fi
rm -f $(STAGING_DIR)/usr/bin/vpnc rm -f $(STAGING_DIR)/usr/bin/vpnc
vpnc-dirclean: vpnc-dirclean: