diff options
| author | Michael Meskes <meskes@debian.org> | 2009-07-01 09:47:13 +0200 |
|---|---|---|
| committer | Michael Meskes <meskes@debian.org> | 2009-07-01 09:47:13 +0200 |
| commit | 519cfe73fc8bfbb621340d6e1665edf7cc7c42e3 (patch) | |
| tree | f8fcff39649e098ff27fa02c49815ca9fd6bb300 /Makefile.kmk | |
| parent | ffd803c5f75d470a7bd301d9fc899703546bedfb (diff) | |
| download | virtualbox-519cfe73fc8bfbb621340d6e1665edf7cc7c42e3.tar.gz | |
Imported Upstream version 3.0.0-dfsgupstream/3.0.0-dfsg
Diffstat (limited to 'Makefile.kmk')
| -rw-r--r-- | Makefile.kmk | 31 |
1 files changed, 12 insertions, 19 deletions
diff --git a/Makefile.kmk b/Makefile.kmk index fc72f85eb..bec42ed77 100644 --- a/Makefile.kmk +++ b/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk $ +# $Id: Makefile.kmk 20645 2009-06-16 18:41:16Z vboxsync $ ## @file # Top level makefile. # @@ -450,6 +450,7 @@ VBOX_CORE_DOXYFILE_INPUT_DIRS = \ VBOX_CORE_DOXYFILE_INPUT_FIRST =\ $(PATH_ROOT)/doc/VBox-doc.c \ $(PATH_ROOT)/doc/VBox-CodingGuidelines.cpp \ + $(PATH_ROOT)/doc/VBox-MakefileGuidelines.cpp \ $(PATH_ROOT)/src/VBox/VMM/VMMCodingGuidelines.cpp \ $(PATH_ROOT)/src/VBox/VMM/VMMDocsRawMode.cpp \ $(PATH_ROOT)/include/VBox/cdefs.h \ @@ -660,7 +661,7 @@ additions-build-os2.x86: #ifeq ($(KBUILD_TARGET),os2) # + $(VBOX_KMK_TIME) $(KMK) $(VBOX_ADDITIONS_BUILD.x86) #else -# $(VBOX_KMK_TIME) ssh vbox@192.168.27.3 " cd /mnt/vbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && ./tools/env.sh --no-wine kmk $(VBOX_ADDITIONS_BUILD.x86) " +# $(VBOX_KMK_TIME) ssh vbox@192.168.27.3 " cd /mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_ADDITIONS_BUILD.x86) " #endif additions-build-linux.amd64: @@ -721,8 +722,8 @@ snapshot-ose: echo "Please do 'kmk snapshot-ose VBOX_OSE=1'"; \ echo; \ exit 1; \ - fi; \ - $(QUIET)mkdir -p $(TARBALLPATH) + fi + $(QUIET)$(MKDIR) -p $(TARBALLPATH) $(QUIET)$(RM) -f $(TARBALLPATH)/$(TARBALLROOT) $(QUIET)$(LN_SYMLINK) $(PATH_ROOT) $(TARBALLPATH)/$(TARBALLROOT) $(QUIET)tar -cjh --owner 0 --group 0 --totals \ @@ -743,7 +744,7 @@ snapshot-ose: # # Generate VirtualBox-x.x.x.tar.bz2 (PUEL) zip archives for internal use only # - includes kBuild -# - must be executed on an OSE checkout +# - must be executed on an PUEL checkout # # the path where to store the zip archive @@ -813,19 +814,11 @@ include $(KBUILD_PATH)/subfooter.kmk # Generate x86.mac and err.mac. # incs: - $(SED) -f include/VBox/err.sed --output include/VBox/err.mac include/VBox/err.h + $(SED) -f include/VBox/err.sed --output include/VBox/err.mac include/VBox/err.h $(APPEND) include/VBox/err.mac '%include "iprt/err.mac"' - $(SED) -f include/VBox/err.sed --output include/iprt/err.mac include/iprt/err.h - $(SED) \ - -e '/__VBox_x86_h__/d' \ - -e '/#define/!d' \ - -e '/\\$$/d' \ - -e 's/#define/%define/' \ - -e 's/\([0-9a-fA-F][0-9a-fA-F]*\)U$$/\1/' \ - -e 's/\([0-9a-fA-F][0-9a-fA-F]*\)U[[:space:]]/\1 /' \ - -e 's/[[:space:]]\/\*\*<.*$$//' \ - --output include/VBox/x86.mac \ - include/VBox/x86.h + $(SED) -f include/VBox/err.sed --output include/iprt/err.mac include/iprt/err.h + $(SED) -f include/VBox/various.sed --output include/VBox/x86.mac include/VBox/x86.h + $(SED) -f include/VBox/various.sed --output include/VBox/param.mac include/VBox/param.h # @@ -834,8 +827,8 @@ incs: vslick.h: include/VBox/cdefs.h include/iprt/cdefs.h $(MAKEFILE) $(RM) -f -- $@ $@.tmp $@.tmp2 $@.tmp3 $(APPEND) $@.tmp '// autogenerated' - #@$(APPEND) $@.tmp '#define __BEGIN_DECLS ' - #@$(APPEND) $@.tmp '#define __END_DECLS ' + @$(APPEND) $@.tmp '#define RT_C_DECLS_BEGIN ' + @$(APPEND) $@.tmp '#define RT_C_DECLS_END ' @$(APPEND) $@.tmp '#define ATL_NO_VTABLE ' @$(APPEND) $@.tmp '#define BEGIN_COM_MAP(a) ' |