Update

[l4.git] / l4 / pkg / l4con / server / src / Make.rules

diff --git a/l4/pkg/l4con/server/src/Make.rules b/l4/pkg/l4con/server/src/Make.rules
index ea7e5a0f662a0ab998939e4afed54b988ac86fb2..b377e79429fa48d2ab8bb4c793c456610d7ef3c2 100644 (file)
--- a/l4/pkg/l4con/server/src/Make.rules
+++ b/l4/pkg/l4con/server/src/Make.rules
@@ -1,16 +1,15 @@
 # vim:set ft=make:
 
 TARGET         = con
+SRC_CC_IS_CXX11 = y
 
-REQUIRES_LIBS   += libio input libirq libgfxbitmap l4util
+REQUIRES_LIBS      += libio input libirq libgfxbitmap l4util l4re_c-util
+REQUIRES_LIBS_x86   = x86emu_int10 lxfuxlibc
+REQUIRES_LIBS_amd64 = x86emu_int10
+REQUIRES_LIBS_arm   = libdrivers-lcd libdrivers-generic
+REQUIRES_LIBS_ppc32 = libdrivers-lcd libdrivers-generic
+REQUIRES_LIBS_sparc = libdrivers-lcd libdrivers-generic
 PRIVATE_INCDIR = $(SRC_DIR)
-MODE_USE_C      = y
-L4_MULTITHREADED = y
-LIBS_x86       = -lclxfux.o -lx86emu_int10 -lx86emu
-LIBS_amd64     =            -lx86emu_int10 -lx86emu
-LIBS_arm        = -larm_lcd.o -larm_generic
-LIBS_ppc32      = -larm_lcd.o -larm_generic
-LIBS_sparc      = -larm_lcd.o -larm_generic
 LIBS          += -L$(OBJ_DIR)/con_yuv2rgb/OBJ-$(ARCH)_$(CPU) \
                  -L$(OBJ_DIR)/con_hw/OBJ-$(SYSTEM) \
                  -lcon_yuv2rgb $(LIBS_$(ARCH)) -lcon_hw