X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/3117161eb332e203eeb84dacdcb6b0412fd55e8f..5ece0782781b924c1c5e972fbbce18cde3fc19ce:/openwrt/package/linux-atm/Makefile

diff --git a/openwrt/package/linux-atm/Makefile b/openwrt/package/linux-atm/Makefile
index ac36e3965..3c7bf9c5b 100644
--- a/openwrt/package/linux-atm/Makefile
+++ b/openwrt/package/linux-atm/Makefile
@@ -12,19 +12,19 @@ PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz
 PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+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; \
 		$(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) \
@@ -35,7 +35,7 @@ $(PKG_BUILD_DIR)/.configured:
 		  --exec-prefix=/usr \
 		  --bindir=/usr/bin \
 		  --datadir=/usr/share \
-		  --includedir=/usr/src/openwrt/build_mipsel/linux/include/ \
+		  --includedir=/usr/include/ \
 		  --infodir=/usr/share/info \
 		  --libdir=/usr/lib \
 		  --libexecdir=/usr/lib \
@@ -47,19 +47,44 @@ $(PKG_BUILD_DIR)/.configured:
 	touch $@
 
 $(PKG_BUILD_DIR)/.built:
-	$(MAKE) -C $(PKG_BUILD_DIR) 
+	rm -rf $(PKG_INSTALL_DIR)
+	mkdir -p $(PKG_INSTALL_DIR)
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		all install
 	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
-	ln -sf libatm.1.0.0 $(IDIR_LINUX_ATM)/lib/libatm
-	ln -sf 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)
 
+$(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/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/
+	mkdir -p $(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.so
+
+uninstall-dev:
+	rm -rf \
+		$(STAGING_DIR)/usr/include/atm{,d,sap}.h \
+		$(STAGING_DIR)/usr/lib/libatm.{a,so*} \
+
+compile-targets: install-dev
+clean-targets: uninstall-dev
+
 mostlyclean:
 	$(MAKE) -C $(PKG_BUILD_DIR) clean
 	rm -f $(PKG_BUILD_DIR)/.built