Remove the disabling of sound support for ixp4xx-2.6 compared to generic-2.6

[openwrt.git] / package / strongswan / Makefile

diff --git a/package/strongswan/Makefile b/package/strongswan/Makefile
index 7169635..9993b3b 100644 (file)
--- a/package/strongswan/Makefile
+++ b/package/strongswan/Makefile
@@ -4,7 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #

-# $Id: Makefile $
+# $Id$

 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk


@@ -16,15 +16,12 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://download.strongswan.org/
 PKG_MD5SUM:=57427f5b48123851a73b10d78dd4f8d6
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://download.strongswan.org/
 PKG_MD5SUM:=57427f5b48123851a73b10d78dd4f8d6

-PKG_CAT:=bzcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install

 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/strongswan/Default
   TITLE:=strongSwan
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/strongswan/Default
   TITLE:=strongSwan

+  DEPENDS:=@LINUX_2_4

   DESCRIPTION:=\
        strongSwan is an IPsec implementation for Linux.
   URL:=http://www.strongswan.org/
   DESCRIPTION:=\
        strongSwan is an IPsec implementation for Linux.
   URL:=http://www.strongswan.org/


@@ -46,6 +43,7 @@ define KernelPackage/strongswan
   SUBMENU:=Network Support
   $(call Package/strongswan/Default)
   TITLE+= (kernel module)
   SUBMENU:=Network Support
   $(call Package/strongswan/Default)
   TITLE+= (kernel module)

+  DEPENDS:=@LINUX_2_4

   DESCRIPTION+=\\\
        \\\
        This package contains the strongSwan kernel module.
   DESCRIPTION+=\\\
        \\\
        This package contains the strongSwan kernel module.


@@ -59,7 +57,7 @@ PKG_MAKE_OPTS:= \
                KERNELSRC="$(LINUX_DIR)" \
                ARCH="$(LINUX_KARCH)" \
                CROSS_COMPILE="$(TARGET_CROSS)" \
                KERNELSRC="$(LINUX_DIR)" \
                ARCH="$(LINUX_KARCH)" \
                CROSS_COMPILE="$(TARGET_CROSS)" \

-               USERCOMPILE="$(TARGET_CFLAGS) -I./linux/include -I$(STAGING_DIR)/usr/include -L$(STAGING_DIR)/usr/lib" \
+               USERCOMPILE="$(TARGET_CFLAGS) -I./linux/include $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)" \

                IPSECDIR="/usr/lib/ipsec" \
                INC_USRLOCAL="/usr" \
 
                IPSECDIR="/usr/lib/ipsec" \
                INC_USRLOCAL="/usr" \
 


@@ -67,7 +65,7 @@ define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
                $(PKG_MAKE_OPTS) \
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
                $(PKG_MAKE_OPTS) \

-               LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+               LDFLAGS="$(TARGET_LDFLAGS)" \

                DESTDIR="$(PKG_INSTALL_DIR)" \
                programs module install
 endef
                DESTDIR="$(PKG_INSTALL_DIR)" \
                programs module install
 endef