cleaned up installdev of xorg libs

[openwrt/svn-archive/archive.git] / XOrg / lib / common.mk

diff --git a/XOrg/lib/common.mk b/XOrg/lib/common.mk
index 3359041f1a9da85f8da6bac31d72813bf8f8e17d..2843bf8237bc1fe5df13c6fd6a88492ef9c1176c 100644 (file)
--- a/XOrg/lib/common.mk
+++ b/XOrg/lib/common.mk
@@ -10,10 +10,29 @@ PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/lib/
 
 _CATEGORY:=libraries
 _DEPEND+=+xorg-headers-native +util-macros-X11R7.2 
 
 _CATEGORY:=libraries
 _DEPEND+=+xorg-headers-native +util-macros-X11R7.2 

+

 include ../../common.mk
 
 include ../../common.mk
 

+ifeq ("$(PKG_NAME)","libX11-X11R7.2")
+ CONFIGURE_ARGS_XTRA=--without-xcb
+endif
+
+define libX11-X11R7.2/Compile
+       $(MAKE_VARS) \
+               $(MAKE) -C $(PKG_BUILD_DIR)/src/util CFLAGS="" LDFLAGS="" CC="cc" makekeys 
+endef
+
+define libXt-X11R7.2/Compile
+       $(MAKE_VARS) \
+               $(MAKE) -C $(PKG_BUILD_DIR)/util CFLAGS="" LDFLAGS="" CC="cc" 
+endef
+

 define Build/Compile
 define Build/Compile

+       $(call $(PKG_NAME)/Compile)

        make -C $(PKG_BUILD_DIR)
        make -C $(PKG_BUILD_DIR)

+       mkdir -p $(PKG_INSTALL_DIR)
+       DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
+       find $(PKG_INSTALL_DIR) -name *.la | xargs rm -rf

 endef
 
 define Build/Configure
 endef
 
 define Build/Configure


@@ -29,24 +48,21 @@ define Build/Configure
        )
 endef
 
        )
 endef
 

-define libXaw-X11R7.1/install
-       rm -f $(1)/usr/lib/libXaw.so.*
-       cd $(1)/usr/lib; ln -s libXaw7.so.7.0.0 libXaw.so.7; ln -s libXaw6.so.6.0.1 libXaw.so.6
+define Package/$(PKG_NAME)/install/Default
+       $(INSTALL_DIR) $(1)/usr/lib
+       find $(PKG_INSTALL_DIR)/usr/lib/ -name lib*so* | $(XARGS) -i -t cp -P {} $(1)/usr/lib 

 endef
 
 endef
 

-define Package/${PKG_NAME}/install
-       $(INSTALL_DIR) $(1)/usr/lib
-       if [ -d $(PKG_BUILD_DIR)/src/.libs/ ]; then \
-               cp -f $(PKG_BUILD_DIR)/src/.libs/lib*so* $(1)/usr/lib ; \
-       fi
-       if [ -d $(PKG_BUILD_DIR)/.libs/ ]; then \
-               cp -f $(PKG_BUILD_DIR)/.libs/lib*so* $(1)/usr/lib ; \
-       fi
-       $(call $(PKG_NAME)/install,$(1))
+define Package/$(PKG_NAME)/install
+       $(call Package/$(PKG_NAME)/install/Default,$(1))
+endef
+
+define Package/libXaw-X11R7.1/install
+       $(call Package/$(PKG_NAME)/install/Default,$(1))
+       cd $(1)/usr/lib; rm -f libXaw.so.7  libXaw.so.6; ln -s libXaw7.so.7.0.0 libXaw.so.7; ln -s libXaw6.so.6.0.1 libXaw.so.6

 endef
 
 define Build/InstallDev
 endef
 
 define Build/InstallDev

-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/$(SUBPACKAGE)  $(MAKE_FLAGS) install
-       rm -rf $(STAGING_DIR)/usr/lib/*.la
+       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)

 endef
 
 endef