X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=Xorg%2Fxserver%2Fxglamo%2FMakefile;h=fd2f9312ef4a2ec83dfc6eb412cabbe81ee461a0;hp=5e4c5036153e7d9b5fbb1601c59b80ee6bf9fb23;hb=a54e69a0621517b37b4aebce031ea0cca5ddd2d7;hpb=b12f9a09aead70181eaafcb4cd9e39cbe680398e

diff --git a/Xorg/xserver/xglamo/Makefile b/Xorg/xserver/xglamo/Makefile
index 5e4c503615..fd2f9312ef 100644
--- a/Xorg/xserver/xglamo/Makefile
+++ b/Xorg/xserver/xglamo/Makefile
@@ -52,8 +52,13 @@ CONFIGURE_ARGS += --disable-dga \
 
 CONFIGURE_VARS+=ac_cv_file__usr_share_sgml_X11_defs_ent=yes
 
-ifeq ($(CONFIG_TARGET_om_gta02),y)
+ifeq ($(CONFIG_TARGET_s3c24xx_openmoko-gta02-graphical),y)
   X_CONFIG=om_gta02
+  TS_POINTERCAL=om_gta02
+endif
+ifeq ($(CONFIG_TARGET_s3c24xx_openmoko-gta02-minimal),y)
+  X_CONFIG=om_gta02
+  TS_POINTERCAL=om_gta02
 endif
 
 define Package/xglamo
@@ -95,7 +100,8 @@ define Package/xglamo
   +pixman \
   +libopenssl \
   +util-macros \
-  @DISPLAY_SUPPORT
+  @DISPLAY_SUPPORT \
+  @arm||armeb
 endef
 
 define Package/xglamo/description
@@ -120,7 +126,8 @@ define Package/xglamo/install
 	$(INSTALL_DIR) $(1)/usr/bin $(1)/usr/lib $(1)/etc/init.d $(1)/etc/config
 	$(CP) $(PKG_INSTALL_DIR)/usr/bin/Xglamo $(1)/usr/bin/
 	$(CP) ./files/x.init $(1)/etc/init.d/x11
-	$(if $(X_CONFIG),$(CP) ./files/config/$(X_CONFIG) $(1)/etc/config/x11)
+	$(if $(TS_POINTERCAL),$(CP) ./files/pointercal.$(TS_POINTERCAL) $(1)/etc/pointercal)
+	$(if $(X_CONFIG),$(CP) ./files/config/x11.$(X_CONFIG) $(1)/etc/config/x11)
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
 endef