gitolite/buildrootschalter
gitolite
/
buildrootschalter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- the $(XSERVER) target can be provided by different X server impls. Adjust users 

- rdesktop needs an xserver impl
This commit is contained in:
Bernhard Reutner-Fischer 2007-02-04 19:47:41 +00:00
parent 842686b9fb
commit 4bbeb74b2e
10 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
package/Makefile.in
View File

@ -111,3 +111,16 @@ ifeq ($(BR2_INSTALL_LIBSTDCPP),)
TARGET_CONFIGURE_OPTS+=CXX=""
endif
# X Windowing system
XSERVER:=
ifeq ($(strip $(BR2_PACKAGE_TINYX)),y)
XSERVER+=tinyx
endif
ifeq ($(strip $(BR2_PACKAGE_XORG)),y)
XSERVER+=xorg
endif
ifeq ($(strip $(BR2_PACKAGE_XGGI)),y)
XSERVER+=xggi
endif

2
package/cairo/cairo.mk
View File

@ -134,7 +134,7 @@ $(TARGET_DIR)/lib/libcairo.so.2.9.3: $(STAGING_DIR)/lib/$(CAIRO_BINARY)
$(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libcairo.so.2.*
touch -c $(TARGET_DIR)/lib/libcairo.so.2.9.3
cairo: uclibc gettext libintl pkgconfig libglib2 xorg $(TARGET_DIR)/lib/libcairo.so.2.9.3
cairo: uclibc gettext libintl pkgconfig libglib2 $(XSERVER) $(TARGET_DIR)/lib/libcairo.so.2.9.3
cairo-clean:
rm -f $(TARGET_DIR)/lib/$(CAIRO_BINARY)

2
package/dillo/dillo.mk
View File

@ -38,7 +38,7 @@ $(DILLO_DIR)/.installed: $(DILLO_DIR)/src/dillo
$(MAKE) -C $(DILLO_DIR) DESTDIR=$(TARGET_DIR) install
touch $(DILLO_DIR)/.installed
dillo: uclibc xorg libglib12 libgtk12 jpeg libpng $(DILLO_DIR)/.installed
dillo: uclibc $(XSERVER) libglib12 libgtk12 jpeg libpng $(DILLO_DIR)/.installed
dillo-source: $(DL_DIR)/$(DILLO_SOURCE)

2
package/libgtk12/libgtk12.mk
View File

@ -85,7 +85,7 @@ $(TARGET_DIR)/lib/libgtk-1.2.so.0.9.1: $(STAGING_DIR)/lib/$(LIBGTK12_BINARY)
$(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libgdk-1.2.so.0.9.1
touch -c $(TARGET_DIR)/lib/libgtk-1.2.so.0.9.1
libgtk12: uclibc libglib12 xorg $(TARGET_DIR)/lib/libgtk-1.2.so.0.9.1
libgtk12: uclibc libglib12 $(XSERVER) $(TARGET_DIR)/lib/libgtk-1.2.so.0.9.1
libgtk12-clean:
rm -f $(TARGET_DIR)/lib/libgtk* $(TARGET_DIR)/lib/libgdk*

2
package/libgtk2/libgtk2.mk
View File

@ -150,7 +150,7 @@ $(TARGET_DIR)/lib/libgtk-x11-2.0.so.0: $(STAGING_DIR)/lib/$(LIBGTK2_BINARY)
cp package/libgtk2/gtk.immodules $(TARGET_DIR)/etc/gtk-2.0
touch -c $(TARGET_DIR)/lib/libgtk-x11-2.0.so.0
libgtk2: uclibc png jpeg tiff xorg libglib2 \
libgtk2: uclibc png jpeg tiff $(XSERVER) libglib2 \
cairo pango atk $(TARGET_DIR)/lib/libgtk-x11-2.0.so.0
libgtk2-clean:

2
package/metacity/metacity.mk
View File

@ -138,7 +138,7 @@ $(TARGET_DIR)/lib/*metacity*.so: $(STAGING_DIR)/lib/*metacity*.so
(cd $(TARGET_DIR)/usr/share/themes; rm -rf Atlanta; ln -s Clearlooks Atlanta)
cp -a package/metacity/Xsession $(TARGET_DIR)/etc/X11/
metacity: uclibc zlib xorg libgtk2 $(TARGET_DIR)/lib/*metacity*.so
metacity: uclibc zlib $(XSERVER) libgtk2 $(TARGET_DIR)/lib/*metacity*.so
metacity-clean:
-$(MAKE) -C $(METACITY_DIR) clean

2
package/pango/pango.mk
View File

@ -154,7 +154,7 @@ $(TARGET_DIR)/lib/libpango-1.0.so.0: $(STAGING_DIR)/lib/$(PANGO_BINARY)
cp package/pango/pangox.aliases $(TARGET_DIR)/etc/pango/
touch -c $(TARGET_DIR)/lib/libpango-1.0.so.0
pango: uclibc gettext libintl pkgconfig libglib2 xorg cairo \
pango: uclibc gettext libintl pkgconfig libglib2 $(XSERVER) cairo \
$(TARGET_DIR)/lib/libpango-1.0.so.0
pango-clean:

2
package/rdesktop/rdesktop.mk
View File

@ -38,7 +38,7 @@ $(RDESKTOP_DIR)/.installed: $(RDESKTOP_DIR)/rdesktop
cp $(RDESKTOP_DIR)/rdesktop $(TARGET_DIR)/usr/bin
touch $(RDESKTOP_DIR)/.installed
rdesktop: uclibc xorg openssl $(RDESKTOP_DIR)/.installed
rdesktop: uclibc openssl $(XSERVER) $(RDESKTOP_DIR)/.installed
rdesktop-source: $(DL_DIR)/$(RDESKTOP_SOURCE)

7
package/rxvt/rxvt.mk
View File

@ -63,12 +63,7 @@ $(TARGET_DIR)/usr/X11R6/bin/rxvt: $(RXVT_BINARY)
cp -f $(RXVT_BINARY) $(TARGET_DIR)/usr/X11R6/bin
(cd $(TARGET_DIR)/usr/X11R6/bin; ln -fs rxvt xterm)
ifeq ($(strip $(BR2_PACKAGE_TINYX)),y)
rxvt: tinyx $(TARGET_DIR)/usr/X11R6/bin/rxvt
endif
ifeq ($(strip $(BR2_PACKAGE_XORG)),y)
rxvt: xorg $(TARGET_DIR)/usr/X11R6/bin/rxvt
endif
rxvt: $(XSERVER) $(TARGET_DIR)/usr/X11R6/bin/rxvt
rxvt-clean:
rm -f $(TARGET_DIR)/usr/X11R6/bin/rxvt

8
package/xorg/xorg.mk
View File

@ -44,9 +44,9 @@ DEJAVU_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/deja
DEJAVU_DIR:=$(BUILD_DIR)/dejavu-ttf-$(DEJAVU_VERSION)
# Install Xorg xserver
XSERVER:=Xorg
XORG_XSERVER:=$(XORG_DIR)/programs/Xserver/$(XSERVER)
TARGET_XSERVER:=$(XORG_BINX)/$(XSERVER)
XSERVER_BINARY:=Xorg
XORG_XSERVER:=$(XORG_DIR)/programs/Xserver/$(XSERVER_BINARY)
TARGET_XSERVER:=$(XORG_BINX)/$(XSERVER_BINARY)
# figure out Xorg's idea of corresponding architecture name
ifeq ($(BR2_alpha),y)
@ -127,7 +127,7 @@ $(TARGET_XSERVER): $(XORG_XSERVER)
$(STRIP) $(XORG_PROGS)/$$file || /bin/true ; \
done
cp $(XORG_XSERVER) $(TARGET_XSERVER)
(cd $(XORG_BINX); ln -snf $(XSERVER) X)
(cd $(XORG_BINX); ln -snf $(XSERVER_BINARY) X)
$(STRIP) $(TARGET_XSERVER)
mkdir -p $(XORG_LIBX)/modules
cp -LRf $(XORG_DIR)/exports/lib/modules/ $(XORG_LIBX)/