Changeset 82741 in vbox

Timestamp:

Jan 14, 2020 3:41:36 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

135689

Message:

Main,IPRT,SUP,SharedClipboard: Cleanup fixes.

Location:

trunk/src/VBox

Files:

• HostDrivers/Support/Makefile.kmk (modified) (1 diff)
• HostServices/SharedClipboard/Makefile.kmk (modified) (1 diff)
• Main/Makefile.kmk (modified) (1 diff)
• Main/cbinding/Makefile.kmk (modified) (3 diffs)
• Runtime/Makefile.kmk (modified) (1 diff)
• Runtime/testcase/Makefile.kmk (modified) (1 diff)

trunk/src/VBox/HostDrivers/Support/Makefile.kmk

@@ -141 +141 @@
                 $(call VBOX_SUP_GEN_CERT_MACRO,AppleRoot,AppleRoot%) \
                 $(call VBOX_SUP_GEN_CERT_MACRO,Trusted,TrustedCert%,build)
+
+OTHER_CLEAN += $(VBOX_SUP_WIN_CERTS_FILE)
 
 tst: $(VBOX_SUP_WIN_CERTS_FILE)

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

@@ -98 +98 @@
  tstClipboardX11-2_SOURCES  = VBoxSharedClipboardSvc-x11.cpp
  tstClipboardX11-2_LIBS     = $(LIB_RUNTIME)
- tstClipboardX11-2_CLEANS   = $(tstClipboardX11-2_0_OUTDIR)/tstClipboardX11-2.run
+ tstClipboardX11-2_CLEAN    = $(tstClipboardX11-2_0_OUTDIR)/tstClipboardX11-2.run
 
 $$(tstClipboardX11-2_0_OUTDIR)/tstClipboardX11-2.run: $$(tstClipboardX11-2_1_STAGE_TARGET)

trunk/src/VBox/Main/Makefile.kmk

@@ -326 +326 @@
  VBoxAPIWrap_VBOX_KMK_FILE = $(PATH_OUT)/vboxapiwrap.kmk
  include $(VBoxAPIWrap_VBOX_KMK_FILE)
+ OTHER_CLEAN += $(VBoxAPIWrap_VBOX_KMK_FILE) $(VBoxAPIWrap_VBOX_KMK_FILE).ts
 
  ifdef VBOX_WITH_32_ON_64_MAIN_API

trunk/src/VBox/Main/cbinding/Makefile.kmk

@@ -31 +31 @@
         makefile.tstCAPIGlue=>Makefile
 
+#
+# The ???.
+#
 INSTALLS += CAPIGlue
 CAPIGlue_MODE = a+r,u+rw
@@ -38 +41 @@
         VBoxCAPIGlue.c \
         $(CAPIHeaders_0_OUTDIR)/VBoxCAPIGlue.h
-
-INSTALLS += CAPIHeaders
-CAPIHeaders_MODE = a+r,u+rw
-CAPIHeaders_INST = $(INST_SDK)bindings/c/include/
-CAPIHeaders_SOURCES = \
-        $(CAPIHeaders_0_OUTDIR)/VBoxCAPI.h=>VBoxCAPI_v$(VBOX_API_VERSION).h
-CAPIHeaders_CLEAN = \
-        $(CAPIHeaders_0_OUTDIR)/VBoxCAPI.h
+CAPIGlue_CLEAN = \
+        $(CAPIHeaders_0_OUTDIR)/VBoxCAPIGlue.h
 
 $$(CAPIHeaders_0_OUTDIR)/VBoxCAPIGlue.h: \
@@ -55 +52 @@
                 -e 's/@VBOX_API_VERSION@/$(VBOX_API_VERSION)/' \
                 <  $< >  $@
+
+#
+# The ???.
+#
+INSTALLS += CAPIHeaders
+CAPIHeaders_MODE = a+r,u+rw
+CAPIHeaders_INST = $(INST_SDK)bindings/c/include/
+CAPIHeaders_SOURCES = \
+        $(CAPIHeaders_0_OUTDIR)/VBoxCAPI.h=>VBoxCAPI_v$(VBOX_API_VERSION).h
+CAPIHeaders_CLEAN = \
+        $(CAPIHeaders_0_OUTDIR)/VBoxCAPI.h
 
 $$(CAPIHeaders_0_OUTDIR)/VBoxCAPI.h: \

trunk/src/VBox/Runtime/Makefile.kmk

@@ -1570 +1570 @@
 
  BLDDIRS += $(IPRT_OUT_DIR)/man/
- OTHER_CLEAN += \
-        $(addprefix $(IPRT_OUT_DIR)/man/,$(IPRT_XML_REFENTRY_FILES)) \
-        $(addprefix $(IPRT_OUT_DIR)/man/,$(patsubst %.xml,%.h,$(IPRT_XML_REFENTRY_FILES))) \
-        $(addprefix $(IPRT_OUT_DIR)/man/,$(patsubst %.xml,%.h.ts,$(IPRT_XML_REFENTRY_FILES)))
+ OTHER_CLEAN += $(foreach xml,$(basename $(notdir $(IPRT_XML_REFENTRY_FILES))), \
+        $(IPRT_OUT_DIR)/man/$(xml).xml $(IPRT_OUT_DIR)/man/$(xml).h $(IPRT_OUT_DIR)/man/$(xml).h.ts)
 
 

trunk/src/VBox/Runtime/testcase/Makefile.kmk

@@ -511 +511 @@
 tstLog_INCS          = $(tstLog_0_OUTDIR)
 tstLog_INTERMEDIATES = $(tstLog_0_OUTDIR)/tstLogGroups.h
-tstLog_CLEANS        = $(tstLog_0_OUTDIR)/tstLogGroups.h
+tstLog_CLEAN         = $(tstLog_0_OUTDIR)/tstLogGroups.h
 $$(tstLog_0_OUTDIR)/tstLogGroups.h: $(PATH_ROOT)/include/VBox/log.h
         $(call MSG_GENERATE,,$@,$<)