Changeset 21093 in vbox

Timestamp:

Jun 30, 2009 6:51:02 PM (16 years ago)

Author:

vboxsync

Message:

add build fix?

Location:

trunk/src/VBox

Files:

• GuestHost/SharedClipboard/Makefile.kmk (modified) (2 diffs)
• HostServices/SharedClipboard/Makefile.kmk (modified) (1 diff)

trunk/src/VBox/GuestHost/SharedClipboard/Makefile.kmk

@@ -1 +1 @@
 # $Id$
 ## @file
-# Sub-Makefile for the Guest Properties Host Service testcases.
+# Sub-Makefile for the shared clipboard code for both host and guest.
 #
 
 #
-# Copyright (C) 2006-2007 Sun Microsystems, Inc.
+# Copyright (C) 2006-2009 Sun Microsystems, Inc.
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -23 +23 @@
 include $(KBUILD_PATH)/subheader.kmk
 
-ifdef VBOX_WITH_TESTCASES
- if1of ($(KBUILD_TARGET),freebsd linux netbsd openbsd solaris)
-  ifndef VBOX_ONLY_SDK
+if defined(VBOX_WITH_TESTCASES) && !defined(VBOX_ONLY_ADDITIONS) && !defined(VBOX_ONLY_SDK)
+ if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
+  #
+  # Set these in LocalConfig.kmk if you are working on the X11 clipboard service
+  # to automatically run the unit tests at build time:
+  #    OTHERS += $(PATH_tstClipboardX11)/tstClipboardX11.run
+  #    OTHERS += $(PATH_tstClipboardX11Smoke)/tstClipboardX11Smoke.run
+  #
+  PROGRAMS += tstClipboardX11 tstClipboardX11Smoke
+  TESTING  += $(PATH_tstClipboardX11)/tstClipboardX11.run $(PATH_tstClipboardX11Smoke)/tstClipboardX11Smoke.run
+  tstClipboardX11_TEMPLATE = VBOXR3TSTEXE
+  tstClipboardX11_DEFS     = VBOX_WITH_HGCM TESTCASE
+  tstClipboardX11_SOURCES  = x11-clipboard.cpp clipboard-helper.cpp
+  tstClipboardX11_CLEAN    = $(PATH_tstClipboardX11)/tstClipboardX11.run
 
-# Set these in LocalConfig.kmk if you are working on the X11 clipboard service
-# to automatically run the unit tests at build time:
-#    OTHERS += $(PATH_tstClipboardX11)/tstClipboardX11.run
-#    OTHERS += $(PATH_tstClipboardX11Smoke)/tstClipboardX11Smoke.run
+  tstClipboardX11Smoke_TEMPLATE = VBOXR3TSTEXE
+  tstClipboardX11Smoke_DEFS     = VBOX_WITH_HGCM SMOKETEST
+  tstClipboardX11Smoke_SOURCES  = x11-clipboard.cpp clipboard-helper.cpp
+  tstClipboardX11Smoke_LIBPATH  = $(VBOX_LIBPATH_X11)
+  tstClipboardX11Smoke_LIBS     = X11 Xt
+  tstClipboardX11Smoke_CLEAN    = $(PATH_tstClipboardX11Smoke)/tstClipboardX11Smoke.run
 
-   PROGRAMS += tstClipboardX11 tstClipboardX11Smoke
-   tstClipboardX11_TEMPLATE = VBOXR3TSTEXE
-   tstClipboardX11_DEFS     = VBOX_WITH_HGCM TESTCASE
-   tstClipboardX11_SOURCES  = x11-clipboard.cpp clipboard-helper.cpp
-   tstClipboardX11_LIBS     = $(LIB_RUNTIME)
-
-   tstClipboardX11Smoke_TEMPLATE = VBOXR3TSTEXE
-   tstClipboardX11Smoke_DEFS     = VBOX_WITH_HGCM SMOKETEST
-   tstClipboardX11Smoke_SOURCES  = x11-clipboard.cpp clipboard-helper.cpp
-   tstClipboardX11Smoke_LIBPATH  = $(VBOX_LIBPATH_X11)
-   tstClipboardX11Smoke_LIBS     = $(LIB_RUNTIME) X11 Xt
-
-   TESTING  += $(PATH_tstClipboardX11)/tstClipboardX11.run
 $$(PATH_tstClipboardX11)/tstClipboardX11.run: $$(INSTARGET_tstClipboardX11)
         export VBOX_LOG_DEST=nofile; $(INSTARGET_tstClipboardX11) quiet
         $(QUIET)$(APPEND) -t "$@" "done"
 
-   TESTING  += $(PATH_tstClipboardX11Smoke)/tstClipboardX11Smoke.run
-$$(PATH_tstClipboardX11Smoke)/tstClipboardX11Smoke.run: \
-                $$(INSTARGET_tstClipboardX11)
+$$(PATH_tstClipboardX11Smoke)/tstClipboardX11Smoke.run: $$(INSTARGET_tstClipboardX11)
         export VBOX_LOG_DEST=nofile; $(INSTARGET_tstClipboardX11Smoke) quiet
         $(QUIET)$(APPEND) -t "$@" "done"
-
-  endif # ! VBOX_ONLY_SDK
- endif # 1of ($(KBUILD_TARGET),freebsd linux netbsd openbsd solaris)
-endif # VBOX_WITH_TESTCASES
+ endif
+endif
 
 include $(KBUILD_PATH)/subfooter.kmk

trunk/src/VBox/HostServices/SharedClipboard/Makefile.kmk

@@ -69 +69 @@
         -framework ApplicationServices -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxSharedClipboard.dylib
 
-ifdef VBOX_WITH_TESTCASES
- ifndef VBOX_ONLY_ADDITIONS
-  if1of ($(KBUILD_TARGET),freebsd linux netbsd openbsd solaris)
-   ifndef VBOX_ONLY_SDK
+if defined(VBOX_WITH_TESTCASES) && !defined(VBOX_ONLY_ADDITIONS) && !defined(VBOX_ONLY_SDK)
+ if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
+ #
+ # Set this in LocalConfig.kmk if you are working on the X11 clipboard service
+ # to automatically run the unit test at build time.
+ #       OTHERS += $(PATH_tstClipboardX11-2)/tstClipboardX11-2.run
+ PROGRAMS += tstClipboardX11-2
+ TESTING += $(PATH_tstClipboardX11-2)/tstClipboardX11-2.run
+ tstClipboardX11-2_TEMPLATE = VBOXR3TSTEXE
+ tstClipboardX11-2_DEFS     = VBOX_WITH_HGCM TESTCASE
+ tstClipboardX11-2_SOURCES  = x11-clipboard.cpp
+ tstClipboardX11-2_LIBS     = $(LIB_RUNTIME)
+ tstClipboardX11-2_CLEANS   = $(PATH_tstClipboardX11-2)/tstClipboardX11-2.run
 
-# Set this in LocalConfig.kmk if you are working on the X11 clipboard service
-# to automatically run the unit test at build time.
-#       OTHERS += $(PATH_tstClipboardX11-2)/tstClipboardX11-2.run
-
-    PROGRAMS += tstClipboardX11-2
-    tstClipboardX11-2_TEMPLATE = VBOXR3TSTEXE
-    tstClipboardX11-2_DEFS     = VBOX_WITH_HGCM TESTCASE
-    tstClipboardX11-2_SOURCES  = x11-clipboard.cpp
-    tstClipboardX11-2_LIBS     = $(LIB_RUNTIME)
-
-    TESTING  += $(PATH_tstClipboardX11-2)/tstClipboardX11-2.run
-$$(PATH_tstClipboardX11-2)/tstClipboardX11-2.run: \
-        $$(INSTARGET_tstClipboardX11-2)
+$$(PATH_tstClipboardX11-2)/tstClipboardX11-2.run: $$(INSTARGET_tstClipboardX11-2)
         export VBOX_LOG_DEST=nofile; $(INSTARGET_tstClipboardX11-2) quiet
         $(QUIET)$(APPEND) -t "$@" "done"
-
-   endif # ! VBOX_WITH_SDK
-  endif # 1of ($(KBUILD_TARGET),freebsd linux netbsd openbsd solaris)
- endif # ! VBOX_ONLY_ADDITIONS
-endif # VBOX_WITH_TESTCASES
+ endif # 1of ($(KBUILD_TARGET),freebsd linux netbsd openbsd solaris)
+endif
 
 include $(KBUILD_PATH)/subfooter.kmk