disable speedbooster if wds is enabled

[openwrt.git] / openwrt / package / linux-atm / Makefile

diff --git a/openwrt/package/linux-atm/Makefile b/openwrt/package/linux-atm/Makefile
index 8b218da..ef91e28 100644 (file)
--- a/openwrt/package/linux-atm/Makefile
+++ b/openwrt/package/linux-atm/Makefile
@@ -18,16 +18,18 @@ include $(TOPDIR)/package/rules.mk
 
 ifneq ($(BOARD),ar7)
 BR2_PACKAGE_LINUX_ATM:=m
+BR2_PACKAGE_BR2684CTL:=m
 endif
 
 $(eval $(call PKG_template,LINUX_ATM,linux-atm,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,BR2684CTL,br2684ctl,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
 $(PKG_BUILD_DIR)/.configured:
        (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
-               autoconf; \
-               automake; \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \
+               CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
+               LDFLAGS="-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib" \
                ./configure \
                  --target=$(GNU_TARGET_NAME) \
                  --host=$(GNU_TARGET_NAME) \
@@ -38,7 +40,7 @@ $(PKG_BUILD_DIR)/.configured:
                  --exec-prefix=/usr \
                  --bindir=/usr/bin \
                  --datadir=/usr/share \
-                 --includedir=/usr/include \
+                 --includedir=/usr/include/ \
                  --infodir=/usr/share/info \
                  --libdir=/usr/lib \
                  --libexecdir=/usr/lib \
@@ -58,27 +60,35 @@ $(PKG_BUILD_DIR)/.built:
        touch $@
 
 $(IPKG_LINUX_ATM): 
-       mkdir -p $(IDIR_LINUX_ATM)/usr/sbin
-       mkdir -p $(IDIR_LINUX_ATM)/lib
-       cp $(PKG_BUILD_DIR)/src/br2684/.libs/br2684ctl $(IDIR_LINUX_ATM)/usr/sbin/
-       cp $(PKG_BUILD_DIR)/src/lib/.libs/libatm.1.0.0 $(IDIR_LINUX_ATM)/lib/libatm.1
+       install -d -m0755 $(IDIR_LINUX_ATM)/usr/lib
+       cp $(PKG_INSTALL_DIR)/usr/lib/libatm.so.1 $(IDIR_LINUX_ATM)/usr/lib
        $(RSTRIP) $(IDIR_LINUX_ATM)/
        $(IPKG_BUILD) $(IDIR_LINUX_ATM) $(PACKAGE_DIR)
-       
-$(STAGING_DIR)/usr/lib/libatm.a: $(PKG_BUILD_DIR)/.built
+
+$(IPKG_BR2684CTL): 
+       install -d -m0755 $(IDIR_BR2684CTL)/usr/sbin
+       cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/br2684ctl $(IDIR_BR2684CTL)/usr/sbin/
+       install -d -m0755 $(IDIR_BR2684CTL)/etc/init.d
+       install -m0755 ./files/br2684.init $(IDIR_BR2684CTL)/etc/init.d/S30br2684
+       $(RSTRIP) $(IDIR_BR2684CTL)/
+       $(IPKG_BUILD) $(IDIR_BR2684CTL) $(PACKAGE_DIR)
+
+$(STAGING_DIR)/usr/lib/libatm.so: $(PKG_BUILD_DIR)/.built
        mkdir -p $(STAGING_DIR)/usr/include
-       cp -fpR $(PKG_INSTALL_DIR)/usr/include/atm*.h $(STAGING_DIR)/usr/include/
+       cp -fpR $(PKG_INSTALL_DIR)/usr/include/atm{,d,sap}.h $(STAGING_DIR)/usr/include/
        mkdir -p $(STAGING_DIR)/usr/lib
-       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libatm* $(STAGING_DIR)/usr/lib/
+       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libatm.{a,so*} $(STAGING_DIR)/usr/lib/
        touch $@
 
-install-dev: $(STAGING_DIR)/usr/lib/libatm.a
+install-dev: $(STAGING_DIR)/usr/lib/libatm.so
+
 uninstall-dev:
        rm -rf \
-               $(STAGING_DIR)/usr/include/atm*.h \
-               $(STAGING_DIR)/usr/lib/libatm.*
+               $(STAGING_DIR)/usr/include/atm{,d,sap}.h \
+               $(STAGING_DIR)/usr/lib/libatm.{a,so*} \
 
 compile: install-dev
+
 clean: uninstall-dev
 
 mostlyclean: