X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=XOrg%2Flib%2Fcommon.mk;h=2843bf8237bc1fe5df13c6fd6a88492ef9c1176c;hp=3359041f1a9da85f8da6bac31d72813bf8f8e17d;hb=196cd906c2def356dd346b6212ca9617f9b02b9f;hpb=850c08635ebba0ce0ccdf77b038eaaf0cd919b21

diff --git a/XOrg/lib/common.mk b/XOrg/lib/common.mk
index 3359041f1a..2843bf8237 100644
--- 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 
+
 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
+	$(call $(PKG_NAME)/Compile)
 	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
@@ -29,24 +48,21 @@ define Build/Configure
 	)
 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
 
-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
-	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