Changeset 6675 in vbox for trunk/src/VBox/Additions/x11

Timestamp:

Jan 31, 2008 7:26:14 PM (17 years ago)

Author:

vboxsync

Message:

fixed additions build for L4

Location:

trunk/src/VBox/Additions/x11

Files:

• Makefile.kmk (modified) (1 diff)
• xclient/Makefile.kmk (modified) (3 diffs)
• xgraphics/Makefile.kmk (modified) (1 diff)

trunk/src/VBox/Additions/x11/Makefile.kmk

@@ -21 +21 @@
 # Include sub-dirs.
 SUBDIRS =
-if1of ($(BUILD_TARGET),linux solaris)
+if1of ($(BUILD_TARGET),l4 linux solaris)
 SUBDIRS += \
         xclient \

trunk/src/VBox/Additions/x11/xclient/Makefile.kmk

@@ -23 +23 @@
 #
 PROGRAMS += VBoxClient
-ifneq ($(BUILD_TARGET),linux) ## @todo Elimiate this too.
+if1of ($(BUILD_TARGET),linux l4) ## @todo Elimiate this too.
+ VBoxClient_TEMPLATE = VBOXLNX32GUESTR3EXE
+else
  VBoxClient_TEMPLATE = VBOXGUESTR3CPPEXE
-else
- VBoxClient_TEMPLATE = VBOXLNX32GUESTR3EXE
 endif
 VBoxClient_DEFS    += VBOX_X11_CLIPBOARD VBOX_HGCM
@@ -33 +33 @@
         main.cpp
 
-ifneq ($(BUILD_TARGET),linux)
- VBoxClient_SOURCES += \
-        clipboard-new.cpp
- VBoxClient_LIBS    = \
-        $(VBOX_LIB_IPRT_GUEST_R3) \
-        $(VBOX_LIB_VBGL_R3) \
-        X11 \
-        Xt
-else
+if1of ($(BUILD_TARGET),linux l4)
  VBoxClient_SOURCES += \
         clipboard.cpp
@@ -54 +46 @@
         Xt \
         X11
-endif   # target linux
+else
+ VBoxClient_SOURCES += \
+        clipboard-new.cpp
+ VBoxClient_LIBS    = \
+        $(VBOX_LIB_IPRT_GUEST_R3) \
+        $(VBOX_LIB_VBGL_R3) \
+        X11 \
+        Xt
+endif # ! linux || l4
 
 #

trunk/src/VBox/Additions/x11/xgraphics/Makefile.kmk

@@ -18 +18 @@
 DEPTH = ../../../../..
 include $(PATH_KBUILD)/header.kmk
-
-ifeq ($(BUILD_TARGET),l4) ## @todo Frank, check if we can remove this now.
- SUFF_DLL = .so
-endif
 
 #