[pisa-src] r1876 - in trunk/openwrt/package: hipl/Makefile libxml2/Makefile pisa/Makefile
- From: Diego Biurrun <diego@xxxxxxxxxx>
- To: pisa-src@xxxxxxxxxxxxx
- Date: Fri, 27 Nov 2009 18:18:11 +0100
Author: biurrun
Date: Fri Nov 27 18:18:11 2009
New Revision: 1876
Log:
Restore tabs in just the right places - hopefully for good this time.
Modified:
trunk/openwrt/package/hipl/Makefile
trunk/openwrt/package/libxml2/Makefile
trunk/openwrt/package/pisa/Makefile
Modified: trunk/openwrt/package/hipl/Makefile
==============================================================================
--- trunk/openwrt/package/hipl/Makefile Fri Nov 27 17:46:23 2009 (r1875)
+++ trunk/openwrt/package/hipl/Makefile Fri Nov 27 18:18:11 2009 (r1876)
@@ -102,96 +102,94 @@
OPENWRT="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib
-L$(TOOLCHAIN_DIR)/lib" \
define Build/Configure
- (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status}; \
- ./autogen.sh --host=$(GNU_TARGET_NAME) --target=$(GNU_TARGET_NAME));
+ (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status}; \
+ ./autogen.sh --host=$(GNU_TARGET_NAME)
--target=$(GNU_TARGET_NAME));
- (cd $(PKG_BUILD_DIR)/libinet6; test -L include || ln -v -s
include_glibc23 include;);
+ (cd $(PKG_BUILD_DIR)/libinet6; test -L include || ln -v -s
include_glibc23 include;);
- (cp $(PKG_BUILD_DIR)/libinet6/include/ifaddrs.h $(STAGING_DIR)/include/);
+ (cp $(PKG_BUILD_DIR)/libinet6/include/ifaddrs.h
$(STAGING_DIR)/include/);
- (cd ..;);
+ (cd ..;);
- $(CONFIGURE_VARS);
-
- $(call Build/Configure/Default, \
- --enable-shared \
- --enable-force-shlib \
- --enable-midauth \
- --enable-openwrt \
- --enable-optimizations \
- --disable-opendht \
- --disable-nls \
- --disable-agent \
- --disable-privsep \
- --disable-i3 \
- --disable-debug \
+ $(CONFIGURE_VARS);
+
+ $(call Build/Configure/Default, \
+ --enable-shared \
+ --enable-force-shlib \
+ --enable-midauth \
+ --enable-openwrt \
+ --enable-optimizations \
+ --disable-opendht \
+ --disable-nls \
+ --disable-agent \
+ --disable-privsep \
+ --disable-i3 \
+ --disable-debug \
);
endef
define Build/Compile
- ($(CONFIGURE_VARS) \
- $(MAKE) -C $(PKG_BUILD_DIR));
- $(MAKE) -C $(PKG_BUILD_DIR) \
- DESTDIR="$(PKG_INSTALL_DIR)" \
- INSTALL="install -c" \
- install
+ ($(CONFIGURE_VARS) $(MAKE) -C $(PKG_BUILD_DIR));
+ $(MAKE) -C $(PKG_BUILD_DIR) \
+ DESTDIR="$(PKG_INSTALL_DIR)" \
+ INSTALL="install -c" install
endef
define Package/hipl-hipd/install
- $(INSTALL_DIR) $(1)/etc/init.d/
- $(INSTALL_DIR) $(1)/usr/sbin/
+ $(INSTALL_DIR) $(1)/etc/init.d/
+ $(INSTALL_DIR) $(1)/usr/sbin/
- $(INSTALL_BIN) ./files/hipd.init $(1)/etc/init.d/hipd
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/hipd $(1)/usr/sbin/
+ $(INSTALL_BIN) ./files/hipd.init $(1)/etc/init.d/hipd
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/hipd $(1)/usr/sbin/
endef
define Package/hipl-hipfw/install
- $(INSTALL_DIR) $(1)/etc/init.d/
- $(INSTALL_DIR) $(1)/usr/sbin/
+ $(INSTALL_DIR) $(1)/etc/init.d/
+ $(INSTALL_DIR) $(1)/usr/sbin/
- $(INSTALL_BIN) ./files/hipfw.init $(1)/etc/init.d/hipfw
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/hipfw $(1)/usr/sbin/
+ $(INSTALL_BIN) ./files/hipfw.init $(1)/etc/init.d/hipfw
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/hipfw $(1)/usr/sbin/
endef
define Package/hipl-hipconf/install
- $(INSTALL_DIR) $(1)/usr/sbin/
+ $(INSTALL_DIR) $(1)/usr/sbin/
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/hipconf $(1)/usr/sbin/
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/hipconf $(1)/usr/sbin/
endef
define Package/hipl-hipproxy/install
- $(INSTALL_DIR) $(1)/usr/sbin/
+ $(INSTALL_DIR) $(1)/usr/sbin/
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/hipdnsproxy $(1)/usr/sbin/
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/hipdnsproxy $(1)/usr/sbin/
endef
define Package/hipl-test/install
- $(INSTALL_DIR) $(1)/etc/hip/test/
- $(INSTALL_DIR) $(1)/usr/bin/
+ $(INSTALL_DIR) $(1)/etc/hip/test/
+ $(INSTALL_DIR) $(1)/usr/bin/
- $(INSTALL_BIN) ./files/test/* $(1)/etc/hip/test/
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/conntest* $(1)/usr/bin/
+ $(INSTALL_BIN) ./files/test/* $(1)/etc/hip/test/
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/conntest* $(1)/usr/bin/
endef
define Package/hipl-common/install
- $(INSTALL_DIR) $(1)/etc/hip/
- $(INSTALL_DIR) $(1)/etc/modules.d/
- $(INSTALL_DIR) $(1)/usr/lib/
- $(INSTALL_DIR) $(1)/usr/bin/
- $(INSTALL_DIR) $(1)/usr/include/
- $(INSTALL_DIR) $(1)/usr/include/libipsec
-
- $(INSTALL_DATA) ./files/hipl.modules $(1)/etc/modules.d/35-hipl
- $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libhipopendht.so* $(1)/usr/lib/
- $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libhipopendht.la $(1)/usr/lib/
- $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libhiptool.so* $(1)/usr/lib/
- $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libhiptool.la $(1)/usr/lib/
- $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libinet6.so* $(1)/usr/lib/
- $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libinet6.la $(1)/usr/lib/
- $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libopphip.so* $(1)/usr/lib/
- $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libopphip.la $(1)/usr/lib/
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/hipsetup $(1)/usr/bin/
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/listifaces $(1)/usr/bin/
+ $(INSTALL_DIR) $(1)/etc/hip/
+ $(INSTALL_DIR) $(1)/etc/modules.d/
+ $(INSTALL_DIR) $(1)/usr/lib/
+ $(INSTALL_DIR) $(1)/usr/bin/
+ $(INSTALL_DIR) $(1)/usr/include/
+ $(INSTALL_DIR) $(1)/usr/include/libipsec
+
+ $(INSTALL_DATA) ./files/hipl.modules $(1)/etc/modules.d/35-hipl
+ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libhipopendht.so*
$(1)/usr/lib/
+ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libhipopendht.la
$(1)/usr/lib/
+ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libhiptool.so* $(1)/usr/lib/
+ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libhiptool.la $(1)/usr/lib/
+ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libinet6.so* $(1)/usr/lib/
+ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libinet6.la $(1)/usr/lib/
+ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libopphip.so* $(1)/usr/lib/
+ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libopphip.la $(1)/usr/lib/
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/hipsetup $(1)/usr/bin/
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/listifaces $(1)/usr/bin/
endef
$(eval $(call BuildPackage,hipl-common))
Modified: trunk/openwrt/package/libxml2/Makefile
==============================================================================
--- trunk/openwrt/package/libxml2/Makefile Fri Nov 27 17:46:23 2009
(r1875)
+++ trunk/openwrt/package/libxml2/Makefile Fri Nov 27 18:18:11 2009
(r1876)
@@ -23,76 +23,74 @@
include $(INCLUDE_DIR)/package.mk
define Package/libxml2
- SECTION:=libs
- CATEGORY:=Libraries
- DEPENDS:=+libpthread +zlib
- TITLE:=Gnome XML library
- URL:=http://xmlsoft.org/
+ SECTION:=libs
+ CATEGORY:=Libraries
+ DEPENDS:=+libpthread +zlib
+ TITLE:=Gnome XML library
+ URL:=http://xmlsoft.org/
endef
define Build/Configure
- $(call Build/Configure/Default, \
- --enable-shared \
- --enable-static \
- --with-c14n \
- --with-html \
- --without-ftp \
- --without-http \
- --without-iconv \
- --without-iso8859x \
- --with-legacy \
- --with-output \
- --with-reader \
- --with-sax1 \
- --with-schemas \
- --with-threads \
- --with-tree \
- --with-valid \
- --with-writer \
- --with-xinclude \
- --with-xpath \
- --with-xptr \
- --with-zlib \
- --with-regexp \
+ $(call Build/Configure/Default, \
+ --enable-shared \
+ --enable-static \
+ --with-c14n \
+ --with-html \
+ --without-ftp \
+ --without-http \
+ --without-iconv \
+ --without-iso8859x \
+ --with-legacy \
+ --with-output \
+ --with-reader \
+ --with-sax1 \
+ --with-schemas \
+ --with-threads \
+ --with-tree \
+ --with-valid \
+ --with-writer \
+ --with-xinclude \
+ --with-xpath \
+ --with-xptr \
+ --with-zlib \
+ --with-regexp \
)
endef
define Build/Compile
- $(MAKE) -C $(PKG_BUILD_DIR) \
- DESTDIR="$(PKG_INSTALL_DIR)" \
- all install
+ $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install
endef
define Build/InstallDev
- mkdir -p $(STAGING_DIR)/usr/bin
- $(CP) $(PKG_INSTALL_DIR)/usr/bin/xml2-config $(STAGING_DIR)/usr/bin/
- mkdir -p $(STAGING_DIR)/usr/include
- $(CP) $(PKG_INSTALL_DIR)/usr/include/libxml2 $(STAGING_DIR)/usr/include/
- mkdir -p $(STAGING_DIR)/usr/lib
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/libxml2.{a,so*} $(STAGING_DIR)/usr/lib/
- mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libxml-2.0.pc
$(STAGING_DIR)/usr/lib/pkgconfig/
- $(SED) 's,-I$$$${includedir}/libxml2,,g' $(STAGING_DIR)/usr/bin/xml2-config
- $(SED) 's,-I$$$${includedir},,g' $(STAGING_DIR)/usr/bin/xml2-config
- $(SED) 's,-I$(STAGING_DIR)/usr/include,,g'
$(STAGING_DIR)/usr/bin/xml2-config
- $(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/bin/xml2-config
- $(SED) 's,-L$(STAGING_DIR)/usr/lib,,g' $(STAGING_DIR)/usr/bin/xml2-config
- $(SED) 's,-I$$$${includedir}/libxml2,,g'
$(STAGING_DIR)/usr/lib/pkgconfig/libxml-2.0.pc
- $(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/libxml-2.0.pc
- $(SED) "s,"prefix\=/usr",prefix=$(STAGING_DIR)/usr,"
$(STAGING_DIR)/usr/lib/pkgconfig/libxml-2.0.pc
- $(SED) "s,"exec_prefix\=/usr",exec_prefix=$(STAGING_DIR)/usr,"
$(STAGING_DIR)/usr/lib/pkgconfig/libxml-2.0.pc
+ mkdir -p $(STAGING_DIR)/usr/bin
+ $(CP) $(PKG_INSTALL_DIR)/usr/bin/xml2-config $(STAGING_DIR)/usr/bin/
+ mkdir -p $(STAGING_DIR)/usr/include
+ $(CP) $(PKG_INSTALL_DIR)/usr/include/libxml2 $(STAGING_DIR)/usr/include/
+ mkdir -p $(STAGING_DIR)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libxml2.{a,so*} $(STAGING_DIR)/usr/lib/
+ mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libxml-2.0.pc
$(STAGING_DIR)/usr/lib/pkgconfig/
+ $(SED) 's,-I$$$${includedir}/libxml2,,g'
$(STAGING_DIR)/usr/bin/xml2-config
+ $(SED) 's,-I$$$${includedir},,g' $(STAGING_DIR)/usr/bin/xml2-config
+ $(SED) 's,-I$(STAGING_DIR)/usr/include,,g'
$(STAGING_DIR)/usr/bin/xml2-config
+ $(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/bin/xml2-config
+ $(SED) 's,-L$(STAGING_DIR)/usr/lib,,g'
$(STAGING_DIR)/usr/bin/xml2-config
+ $(SED) 's,-I$$$${includedir}/libxml2,,g'
$(STAGING_DIR)/usr/lib/pkgconfig/libxml-2.0.pc
+ $(SED) 's,-L$$$${libdir},,g'
$(STAGING_DIR)/usr/lib/pkgconfig/libxml-2.0.pc
+ $(SED) "s,"prefix\=/usr",prefix=$(STAGING_DIR)/usr,"
$(STAGING_DIR)/usr/lib/pkgconfig/libxml-2.0.pc
+ $(SED) "s,"exec_prefix\=/usr",exec_prefix=$(STAGING_DIR)/usr,"
$(STAGING_DIR)/usr/lib/pkgconfig/libxml-2.0.pc
endef
define Build/UninstallDev
- rm -rf $(STAGING_DIR)/usr/bin/xml2-config \
+ rm -rf $(STAGING_DIR)/usr/bin/xml2-config \
$(STAGING_DIR)/usr/include/libxml2 \
$(STAGING_DIR)/usr/lib/libxml2.{a,so*} \
$(STAGING_DIR)/usr/lib/pkgconfig/libxml-2.0.pc
endef
define Package/libxml2/install
- $(INSTALL_DIR) $(1)/usr/lib
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/libxml2.so.* $(1)/usr/lib/
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libxml2.so.* $(1)/usr/lib/
endef
$(eval $(call BuildPackage,libxml2))
Modified: trunk/openwrt/package/pisa/Makefile
==============================================================================
--- trunk/openwrt/package/pisa/Makefile Fri Nov 27 17:46:23 2009 (r1875)
+++ trunk/openwrt/package/pisa/Makefile Fri Nov 27 18:18:11 2009 (r1876)
@@ -34,20 +34,18 @@
-I$(PKG_BUILD_DIR)/include"
define Build/Configure
- $(CONFIGURE_VARS);
+ $(CONFIGURE_VARS);
- $(call Build/Configure/Default, --enable-shared \
- --host=$(GNU_TARGET_NAME) --target=$(GNU_TARGET_NAME));
+ $(call Build/Configure/Default, --enable-shared \
+ --host=$(GNU_TARGET_NAME) --target=$(GNU_TARGET_NAME));
endef
define Build/Compile
- ($(CONFIGURE_VARS) \
- $(MAKE) -C $(PKG_BUILD_DIR));
+ $(CONFIGURE_VARS) $(MAKE) -C $(PKG_BUILD_DIR);
- $(MAKE) -C $(PKG_BUILD_DIR) \
- DESTDIR="$(PKG_INSTALL_DIR)" \
- INSTALL="install -c" \
- install
+ $(MAKE) -C $(PKG_BUILD_DIR) \
+ DESTDIR="$(PKG_INSTALL_DIR)" \
+ INSTALL="install -c" install
endef
define Package/libpisa
@@ -62,9 +60,9 @@
endef
define Package/libpisa/install
- $(INSTALL_DIR) $(1)/usr/lib/
+ $(INSTALL_DIR) $(1)/usr/lib/
- cp -d $(PKG_INSTALL_DIR)/usr/lib/libpisa.so* $(1)/usr/lib/
+ cp -d $(PKG_INSTALL_DIR)/usr/lib/libpisa.so* $(1)/usr/lib/
endef
define Package/pisa-beacon
@@ -78,11 +76,11 @@
endef
define Package/pisa-beacon/install
- $(INSTALL_DIR) $(1)/etc/init.d
- $(INSTALL_DIR) $(1)/usr/sbin/
+ $(INSTALL_DIR) $(1)/etc/init.d
+ $(INSTALL_DIR) $(1)/usr/sbin/
- $(INSTALL_BIN) ./files/pisabeacon.init $(1)/etc/init.d/pisabeacon
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/pisabeacon $(1)/usr/sbin/
+ $(INSTALL_BIN) ./files/pisabeacon.init $(1)/etc/init.d/pisabeacon
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/pisabeacon $(1)/usr/sbin/
endef
define Package/pisa-mobile-guest
@@ -96,14 +94,14 @@
endef
define Package/pisa-mobile-guest/install
- $(INSTALL_DIR) $(1)/etc/init.d
- $(INSTALL_DIR) $(1)/etc/pisa/
- $(INSTALL_DIR) $(1)/usr/sbin/
-
- $(INSTALL_BIN) ./files/pisacd.init $(1)/etc/init.d/pisacd
- $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/pisa/pisacd.conf
$(1)/etc/pisa/pisacd.conf
- $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/pisa/pisacd.startup
$(1)/etc/pisa/pisacd.startup
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/pisacd $(1)/usr/sbin/
+ $(INSTALL_DIR) $(1)/etc/init.d
+ $(INSTALL_DIR) $(1)/etc/pisa/
+ $(INSTALL_DIR) $(1)/usr/sbin/
+
+ $(INSTALL_BIN) ./files/pisacd.init $(1)/etc/init.d/pisacd
+ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/pisa/pisacd.conf
$(1)/etc/pisa/pisacd.conf
+ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/pisa/pisacd.startup
$(1)/etc/pisa/pisacd.startup
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/pisacd $(1)/usr/sbin/
endef
define Package/pisa-trust-point
@@ -117,13 +115,13 @@
endef
define Package/pisa-trust-point/install
- $(INSTALL_DIR) $(1)/etc/init.d
- $(INSTALL_DIR) $(1)/etc/pisa/
- $(INSTALL_DIR) $(1)/usr/sbin/
-
- $(INSTALL_BIN) ./files/pisasd.init $(1)/etc/init.d/pisasd
- $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/pisa/pisasd.conf
$(1)/etc/pisa/pisasd.conf
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/pisasd $(1)/usr/sbin/
+ $(INSTALL_DIR) $(1)/etc/init.d
+ $(INSTALL_DIR) $(1)/etc/pisa/
+ $(INSTALL_DIR) $(1)/usr/sbin/
+
+ $(INSTALL_BIN) ./files/pisasd.init $(1)/etc/init.d/pisasd
+ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/pisa/pisasd.conf
$(1)/etc/pisa/pisasd.conf
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/pisasd $(1)/usr/sbin/
endef
$(eval $(call BuildPackage,pisa))
Other related posts:
- » [pisa-src] r1876 - in trunk/openwrt/package: hipl/Makefile libxml2/Makefile pisa/Makefile - Diego Biurrun
