From 1544712c74632c2917253acb4d475ad2ac6126cc Mon Sep 17 00:00:00 2001 From: nico Date: Fri, 19 Aug 2005 15:49:41 +0000 Subject: [PATCH] fix br2684 build, set common include and lib searchpatch, install dev stuff in staging_dir git-svn-id: svn://svn.openwrt.org/openwrt/trunk@1699 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- openwrt/package/linux-atm/Makefile | 46 ++++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 8 deletions(-) diff --git a/openwrt/package/linux-atm/Makefile b/openwrt/package/linux-atm/Makefile index ac36e3965..adc0a652b 100644 --- a/openwrt/package/linux-atm/Makefile +++ b/openwrt/package/linux-atm/Makefile @@ -12,6 +12,7 @@ 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 @@ -24,7 +25,16 @@ $(eval $(call PKG_template,LINUX_ATM,linux-atm,$(PKG_VERSION)-$(PKG_RELEASE),$(A $(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" \ + LDFLAGS="-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib" \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ @@ -35,7 +45,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 +57,39 @@ $(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 -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/ $(RSTRIP) $(IDIR_LINUX_ATM)/ $(IPKG_BUILD) $(IDIR_LINUX_ATM) $(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: install-dev + +clean: uninstall-dev + mostlyclean: $(MAKE) -C $(PKG_BUILD_DIR) clean rm -f $(PKG_BUILD_DIR)/.built -- 2.20.1