X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/1544712c74632c2917253acb4d475ad2ac6126cc..96fc35f7d44741d9ca527f4fac06a69e5448d942:/openwrt/package/linux-atm/Makefile

diff --git a/openwrt/package/linux-atm/Makefile b/openwrt/package/linux-atm/Makefile
index adc0a652b..43dd6910e 100644
--- a/openwrt/package/linux-atm/Makefile
+++ b/openwrt/package/linux-atm/Makefile
@@ -16,21 +16,11 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(TOPDIR)/package/rules.mk
 
-ifneq ($(BOARD),ar7)
-BR2_PACKAGE_LINUX_ATM:=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; \
-		touch configure.in ; \
-		touch acinclude.m4 ; \
-		touch aclocal.m4 ; \
-		touch Makefile.in ; \
-		touch config.h.in ; \
-		touch configure ; \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \
 		CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
@@ -66,17 +56,23 @@ $(PKG_BUILD_DIR)/.built:
 
 $(IPKG_LINUX_ATM): 
 	install -d -m0755 $(IDIR_LINUX_ATM)/usr/lib
-	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libatm.so.* $(IDIR_LINUX_ATM)/usr/lib
-	install -d -m0755 $(IDIR_LINUX_ATM)/usr/sbin
-	cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/br2684ctl $(IDIR_LINUX_ATM)/usr/sbin/
+	cp -f $(PKG_INSTALL_DIR)/usr/lib/libatm.so.1 $(IDIR_LINUX_ATM)/usr/lib
 	$(RSTRIP) $(IDIR_LINUX_ATM)/
 	$(IPKG_BUILD) $(IDIR_LINUX_ATM) $(PACKAGE_DIR)
 
+$(IPKG_BR2684CTL): 
+	install -d -m0755 $(IDIR_BR2684CTL)/usr/sbin
+	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/br2684ctl $(IDIR_BR2684CTL)/usr/sbin/
+	install -d -m0755 $(IDIR_BR2684CTL)/etc/hotplug.d/net
+	install -m0644 ./files/br2684.init $(IDIR_BR2684CTL)/etc/hotplug.d/net/30-br2684
+	$(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{,d,sap}.h $(STAGING_DIR)/usr/include/
+	$(CP) $(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.{a,so*} $(STAGING_DIR)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libatm.{a,so*} $(STAGING_DIR)/usr/lib/
 	touch $@
 
 install-dev: $(STAGING_DIR)/usr/lib/libatm.so
@@ -86,9 +82,8 @@ uninstall-dev:
 		$(STAGING_DIR)/usr/include/atm{,d,sap}.h \
 		$(STAGING_DIR)/usr/lib/libatm.{a,so*} \
 
-compile: install-dev
-
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
 
 mostlyclean:
 	$(MAKE) -C $(PKG_BUILD_DIR) clean