0
0
mirror of https://git.busybox.net/buildroot.git synced 2024-12-24 12:43:39 +08:00

Get it building

This commit is contained in:
Eric Andersen 2005-07-13 10:29:18 +00:00
parent 85d9e768af
commit a79991083a

View File

@ -13,7 +13,7 @@ XORG_APPS:=xlsfonts/xlsfonts xmodmap/xmodmap
# xhost/xhost xauth/xauth oclock/oclock xeyes/xeyes # xhost/xhost xauth/xauth oclock/oclock xeyes/xeyes
# #
XORG_LIBS:=ICE X11 Xext Xpm XORG_LIBS:=ICE X11 Xext Xpm Xmuu
# Xaw SM Xt Xmu # Xaw SM Xt Xmu
############################################################# #############################################################
@ -29,12 +29,15 @@ XORG_CAT:=bzcat
XORG_DIR:=$(BUILD_DIR)/xc XORG_DIR:=$(BUILD_DIR)/xc
XORG_LDIR:=$(XORG_DIR)/lib XORG_LDIR:=$(XORG_DIR)/lib
XORG_PROGS:=$(XORG_DIR)/programs XORG_PROGS:=$(XORG_DIR)/programs
XORG_BINX:=$(TARGET_DIR)/usr/X11R6/bin/ TARGET_BINX:=/usr/bin/
XORG_BINX:=$(TARGET_DIR)$(TARGET_BINX)
XORG_LIBX:=$(TARGET_DIR)/usr/lib/ XORG_LIBX:=$(TARGET_DIR)/usr/lib/
XORG_CF:=$(XORG_DIR)/config/cf/cross.def XORG_CF:=$(XORG_DIR)/config/cf/cross.def
# Install Xfbdev for use with the kernel frame buffer # Install Xvfb for use with the kernel frame buffer
XORG_XSERVER:=$(XORG_DIR)/programs/Xserver/Xfbdev XSERVER:=Xvfb
XORG_XSERVER:=$(XORG_DIR)/programs/Xserver/$(XSERVER)
TARGET_XSERVER:=$(XORG_BINX)/$(XSERVER)
$(DL_DIR)/$(XORG_SOURCE): $(DL_DIR)/$(XORG_SOURCE):
$(WGET) -P $(DL_DIR) $(XORG_SITE)/$(XORG_SOURCE) $(WGET) -P $(DL_DIR) $(XORG_SITE)/$(XORG_SOURCE)
@ -54,20 +57,22 @@ $(XORG_DIR)/.configure: $(DL_DIR)/$(XORG_SOURCE)
touch $(XORG_DIR)/.configure touch $(XORG_DIR)/.configure
$(XORG_XSERVER): $(XORG_DIR)/.configure $(XORG_XSERVER): $(XORG_DIR)/.configure
rm -f $(XORG_BINX)/Xfbdev rm -f $(TARGET_XSERVER) $(XORG_XSERVER)
( cd $(XORG_DIR) ; $(MAKE) World ) ( cd $(XORG_DIR) ; $(MAKE) World XCURSORGEN=xcursorgen )
$(XORG_BINX)/Xfbdev: $(XORG_XSERVER) $(TARGET_XSERVER): $(XORG_XSERVER)
-mkdir $(TARGET_DIR)/usr/X11R6 -mkdir -p $(XORG_BINX)
-mkdir $(XORG_BINX)
for file in $(XORG_APPS) ; do \ for file in $(XORG_APPS) ; do \
cp -f $(XORG_DIR)/programs/$$file $(XORG_BINX) ; \ cp -f $(XORG_DIR)/programs/$$file $(XORG_BINX) ; \
$(STRIP) $(XORG_PROGS)/$$file ; \ $(STRIP) $(XORG_PROGS)/$$file ; \
done done
cp $(XORG_DIR)/programs/Xserver/Xfbdev $(XORG_BINX) cp $(XORG_XSERVER) $(TARGET_XSERVER)
$(STRIP) $(XORG_BINX)/Xfbdev (cd $(XORG_BINX); ln -snf $(XSERVER) X)
cp -f $(XORG_DIR)/startx $(TARGET_DIR)/bin $(STRIP) $(TARGET_XSERVER)
chmod a+x $(TARGET_DIR)/bin/startx cp -f $(XORG_DIR)/programs/xinit/startx $(XORG_BINX)
cp -f $(XORG_DIR)/programs/xauth/xauth $(XORG_BINX)
cp -f $(XORG_DIR)/programs/xinit/xinit $(XORG_BINX)
chmod a+x $(XORG_BINX)/startx $(XORG_BINX)/xauth $(XORG_BINX)/xinit
$(XORG_LIBX)/libX11.so.6.2: $(XORG_XSERVER) $(XORG_LIBX)/libX11.so.6.2: $(XORG_XSERVER)
for dirs in $(XORG_LIBS) ; do \ for dirs in $(XORG_LIBS) ; do \
@ -78,7 +83,7 @@ $(XORG_LIBX)/libX11.so.6.2: $(XORG_XSERVER)
cp -pRf $$file $(XORG_LIBX) ; \ cp -pRf $$file $(XORG_LIBX) ; \
done done
xorg: zlib $(XORG_LIBX)/libX11.so.6.2 $(XORG_BINX)/Xfbdev xorg: zlib $(XORG_LIBX)/libX11.so.6.2 $(TARGET_XSERVER)
xorg-source: $(DL_DIR)/$(XORG_SOURCE) xorg-source: $(DL_DIR)/$(XORG_SOURCE)