Commit 4bbeb74b authored by Bernhard Reutner-Fischer's avatar Bernhard Reutner-Fischer
Browse files

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

- rdesktop needs an xserver impl
parent 842686b9

package/Makefile.in

+13 −0
Original line number Diff line number Diff line
@@ -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

package/cairo/cairo.mk

+1 −1
Original line number Diff line number Diff line
@@ -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)

package/dillo/dillo.mk

+1 −1
Original line number Diff line number Diff line
@@ -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)

package/libgtk12/libgtk12.mk

+1 −1
Original line number Diff line number Diff line
@@ -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*

package/libgtk2/libgtk2.mk

+1 −1
Original line number Diff line number Diff line
@@ -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: