added module (un)load to wshaper

[openwrt/svn-archive/archive.git] / libs / wxbase / Makefile

diff --git a/libs/wxbase/Makefile b/libs/wxbase/Makefile
index 2162276adbb2334cbf814c36f65c15661359232b..5ad2ec9682fa82f012ed0ffee4e9d5247d019a8a 100644 (file)
--- a/libs/wxbase/Makefile
+++ b/libs/wxbase/Makefile
@@ -106,29 +106,21 @@ CONFIGURE_ARGS+= \
 CONFIGURE_VARS+= \
        CXX="g++-uc+std" \
 
-MAKE_FLAGS += \
-       DESTDIR="$(PKG_INSTALL_DIR)" \
-       all install \
-
-define Build/InstallDev
-       mkdir -p $(STAGING_DIR)/usr/bin
-       $(CP) -L $(PKG_INSTALL_DIR)/usr/bin/wx-config $(STAGING_DIR)/usr/bin/
-       mkdir -p $(STAGING_DIR)/usr/include
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/wx-2.6 $(STAGING_DIR)/usr/include/
-       mkdir -p $(STAGING_DIR)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libwx_base{,_net,_xml}-2.6-*.so $(STAGING_DIR)/usr/lib/
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libwx_base{,_net,_xml}-2.6.so.* $(STAGING_DIR)/usr/lib/
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/wx $(STAGING_DIR)/usr/lib/
-       $(SED) 's,-I$$$${includedir}/wx-2.6,-I$(STAGING_DIR)/usr/include/wx-2.6,g' $(STAGING_DIR)/usr/bin/wx-config
-       $(SED) 's,-I$$$${libdir}/wx/include,-I$(STAGING_DIR)/usr/lib/wx/include,g' $(STAGING_DIR)/usr/bin/wx-config
+define Build/Compile
+       $(MAKE) -C $(PKG_BUILD_DIR) \
+               DESTDIR="$(PKG_INSTALL_DIR)" \
+               all install
 endef
 
-define Build/UninstallDev
-       rm -rf  $(STAGING_DIR)/usr/bin/wx-config \
-               $(STAGING_DIR)/usr/include/wx-2.6 \
-               $(STAGING_DIR)/usr/lib/libwx_base{,_net,_xml}-2.6-*.so \
-               $(STAGING_DIR)/usr/lib/libwx_base{,_net,_xml}-2.6.so.* \
-               $(STAGING_DIR)/usr/lib/wx
+define Build/InstallDev
+       $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/include $(1)/usr/lib
+       $(CP) -L $(PKG_INSTALL_DIR)/usr/bin/wx-config $(1)/usr/bin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/wx-2.6 $(1)/usr/include/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libwx_base{,_net,_xml}-2.6-*.so $(1)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libwx_base{,_net,_xml}-2.6.so.* $(1)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/wx $(1)/usr/lib/
+       $(SED) 's,-I$$$${includedir}/wx-2.6,-I$(STAGING_DIR)/usr/include/wx-2.6,g' $(1)/usr/bin/wx-config
+       $(SED) 's,-I$$$${libdir}/wx/include,-I$(STAGING_DIR)/usr/lib/wx/include,g' $(1)/usr/bin/wx-config
 endef
 
 define Package/libwxbase/install