Changeset 8758 in vbox for trunk/src/libs

Timestamp:

May 11, 2008 6:27:49 PM (17 years ago)

Author:

vboxsync

Message:

BUILD_TARGET* -> KBUILD_TARGET*.

Location:

trunk/src/libs

Files:

• Makefile.kmk (modified) (2 diffs)
• ffmpeg-20060710/Makefile.kmk (modified) (2 diffs)
• xpcom18a4/Makefile.kmk (modified) (14 diffs)

trunk/src/libs/Makefile.kmk

@@ -24 +24 @@
 
 
-subdirs := liblzf-1.51 $(subdirs.$(BUILD_TARGET))
+subdirs := liblzf-1.51 $(subdirs.$(KBUILD_TARGET))
 ifdef IPRT_WITH_KSTUFF
  subdirs += kStuff
@@ -57 +57 @@
  # FFmpeg for test videos
  ifdef VBOX_WITH_FFMPEG
-  ifeq ($(BUILD_TARGET),darwin)
+  ifeq ($(KBUILD_TARGET),darwin)
    subdirs += ffmpeg-20060710
   endif

trunk/src/libs/ffmpeg-20060710/Makefile.kmk

@@ -25 +25 @@
 DLLS                       = VBoxFFmpeg
 
-ifeq ($(BUILD_TARGET),win)
+ifeq ($(KBUILD_TARGET),win)
 VBoxFFmpeg_TOOL.win.x86    = MINGW32
 #VBoxFFmpeg_TOOL.win.amd64  = MINGW64...
@@ -302 +302 @@
 # The import library for Windows builds.
 # The microsoft linker doesn't like the GNU import libraries from this MinGW version.
-# 
-ifeq ($(BUILD_TARGET),win)
+#
+ifeq ($(KBUILD_TARGET),win)
 IMPORT_LIBS += VBoxFFmpegImp
 VBoxFFmpegImp_TEMPLATE = VBOXR3

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -75 +75 @@
                                      -fshort-wchar -fno-rtti -fno-exceptions -fpascal-strings \
                                      -framework CoreServices -framework CoreFoundation -framework Foundation -framework AppKit -framework Carbon
-ifn1of ($(BUILD_TARGET), os2 win)
+ifn1of ($(KBUILD_TARGET), os2 win)
  TEMPLATE_XPCOM_CXXFLAGS          += -fPIC
  TEMPLATE_XPCOM_CFLAGS            += -fPIC
@@ -112 +112 @@
 TEMPLATE_XPCOM_ORDERDEPS           = $(foreach hdrinst, $(filter %-HEADERS, $(INSTALLS)), $(TARGET_$(hdrinst))) \
                                      $(PATH_VBox-xpcom-string)/idl_ts
-ifeq ($(BUILD_TARGET),os2)
+ifeq ($(KBUILD_TARGET),os2)
  ifndef USE_OS2_TOOLKIT_HEADERS
   TEMPLATE_XPCOM_DEFS.os2         += OS2EMX_PLAIN_CHAR
@@ -165 +165 @@
 
 TEMPLATE_XPCOMBLDPROG_DEFS                      = $(TEMPLATE_BLDPROG_DEFS)                      $(TEMPLATE_XPCOMEXE_DEFS)
-TEMPLATE_XPCOMBLDPROG_DEFS.$(BUILD_TARGET)      = $(TEMPLATE_BLDPROG_DEFS.$(BUILD_TARGET))      $(TEMPLATE_XPCOMEXE_DEFS.$(BUILD_TARGET))
-TEMPLATE_XPCOMBLDPROG_DEFS.$(BUILD_TARGET_ARCH) = $(TEMPLATE_BLDPROG_DEFS.$(BUILD_TARGET_ARCH)) $(TEMPLATE_XPCOMEXE_DEFS.$(BUILD_TARGET_ARCH))
+TEMPLATE_XPCOMBLDPROG_DEFS.$(KBUILD_TARGET)      = $(TEMPLATE_BLDPROG_DEFS.$(KBUILD_TARGET))      $(TEMPLATE_XPCOMEXE_DEFS.$(KBUILD_TARGET))
+TEMPLATE_XPCOMBLDPROG_DEFS.$(KBUILD_TARGET_ARCH) = $(TEMPLATE_BLDPROG_DEFS.$(KBUILD_TARGET_ARCH)) $(TEMPLATE_XPCOMEXE_DEFS.$(KBUILD_TARGET_ARCH))
 TEMPLATE_XPCOMBLDPROG_CXXFLAGS          = -ansi -Wall -Wno-non-virtual-dtor
-TEMPLATE_XPCOMBLDPROG_CXXFLAGS.$(BUILD_TARGET_ARCH) = $(TEMPLATE_XPCOMEXE_CXXFLAGS.$(BUILD_TARGET_ARCH))
+TEMPLATE_XPCOMBLDPROG_CXXFLAGS.$(KBUILD_TARGET_ARCH) = $(TEMPLATE_XPCOMEXE_CXXFLAGS.$(KBUILD_TARGET_ARCH))
 TEMPLATE_XPCOMBLDPROG_CXXFLAGS.release  = -O
 TEMPLATE_XPCOMBLDPROG_CXXFLAGS.profile  = -O
@@ -174 +174 @@
 TEMPLATE_XPCOMBLDPROG_CXXFLAGS.linux    = -pthread
 TEMPLATE_XPCOMBLDPROG_CFLAGS            = -pipe -ansi -Wall -Wno-unused
-TEMPLATE_XPCOMBLDPROG_CFLAGS.$(BUILD_TARGET_ARCH) = $(TEMPLATE_XPCOMEXE_CFLAGS.$(BUILD_TARGET_ARCH))
+TEMPLATE_XPCOMBLDPROG_CFLAGS.$(KBUILD_TARGET_ARCH) = $(TEMPLATE_XPCOMEXE_CFLAGS.$(KBUILD_TARGET_ARCH))
 TEMPLATE_XPCOMBLDPROG_CFLAGS.release    = -O
 TEMPLATE_XPCOMBLDPROG_CFLAGS.profile    = -O
@@ -185 +185 @@
                                           $(VBOX_PATH_SDK)/include/xpcom/xpcom \
                                           $(VBOX_PATH_SDK)/include/xpcom/ipcd
-TEMPLATE_XPCOMBLDPROG_INCS.$(BUILD_TARGET)         = $(TEMPLATE_XPCOMEXE_INCS.$(BUILD_TARGET))
-TEMPLATE_XPCOMBLDPROG_INCS.$(BUILD_TARGET_ARCH)    = $(TEMPLATE_XPCOMEXE_INCS.$(BUILD_TARGET_ARCH))
-TEMPLATE_XPCOMBLDPROG_LIBPATH.$(BUILD_TARGET)      = $(TEMPLATE_XPCOMEXE_LIBPATH.$(BUILD_TARGET))
-TEMPLATE_XPCOMBLDPROG_LIBPATH.$(BUILD_TARGET_ARCH) = $(TEMPLATE_XPCOMEXE_LIBPATH.$(BUILD_TARGET_ARCH))
-TEMPLATE_XPCOMBLDPROG_LDFLAGS.$(BUILD_TARGET)      = $(TEMPLATE_XPCOMEXE_LDFLAGS.$(BUILD_TARGET))
-TEMPLATE_XPCOMBLDPROG_LDFLAGS.$(BUILD_TARGET_ARCH) = $(TEMPLATE_XPCOMEXE_LDFLAGS.$(BUILD_TARGET_ARCH))
+TEMPLATE_XPCOMBLDPROG_INCS.$(KBUILD_TARGET)         = $(TEMPLATE_XPCOMEXE_INCS.$(KBUILD_TARGET))
+TEMPLATE_XPCOMBLDPROG_INCS.$(KBUILD_TARGET_ARCH)    = $(TEMPLATE_XPCOMEXE_INCS.$(KBUILD_TARGET_ARCH))
+TEMPLATE_XPCOMBLDPROG_LIBPATH.$(KBUILD_TARGET)      = $(TEMPLATE_XPCOMEXE_LIBPATH.$(KBUILD_TARGET))
+TEMPLATE_XPCOMBLDPROG_LIBPATH.$(KBUILD_TARGET_ARCH) = $(TEMPLATE_XPCOMEXE_LIBPATH.$(KBUILD_TARGET_ARCH))
+TEMPLATE_XPCOMBLDPROG_LDFLAGS.$(KBUILD_TARGET)      = $(TEMPLATE_XPCOMEXE_LDFLAGS.$(KBUILD_TARGET))
+TEMPLATE_XPCOMBLDPROG_LDFLAGS.$(KBUILD_TARGET_ARCH) = $(TEMPLATE_XPCOMEXE_LDFLAGS.$(KBUILD_TARGET_ARCH))
 TEMPLATE_XPCOMBLDPROG_ORDERDEPS         = $(foreach hdrinst, $(filter %-HEADERS, $(INSTALLS)), $(TARGET_$(hdrinst)))
 
@@ -272 +272 @@
 PROGRAMS += VBoxXPCOMIPCD
 
-ifeq ($(BUILD_TARGET),linux)
+ifeq ($(KBUILD_TARGET),linux)
  XPCOM_TYPELIB = $(PATH_BIN)/VBoxXPCOMBase.xpt
 else
@@ -577 +577 @@
         xpcom/typelib/xpt/src/xpt_xdr.c
 
-ifeq ($(BUILD_TARGET),os2)
+ifeq ($(KBUILD_TARGET),os2)
  # glib and libIDL needed by XPCOM on OS/2.
  ifeq ($(VBOX_PATH_GLIB),)
@@ -737 +737 @@
         nsprpub/lib/libc/src/plgetopt.c
 
-ifeq ($(filter-out darwin freebsd linux netbsd openbsd solaris,$(BUILD_TARGET)),) # unixish
+ifeq ($(filter-out darwin freebsd linux netbsd openbsd solaris,$(KBUILD_TARGET)),) # unixish
 VBox-xpcom-nspr_SOURCES += \
         nsprpub/pr/src/md/unix/unix.c \
@@ -935 +935 @@
 VBox-xpcom-io_SOURCES.l4 = \
         xpcom/io/nsLocalFileL4.cpp
-ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(BUILD_TARGET)),)
+ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(KBUILD_TARGET)),)
 VBox-xpcom-io_SOURCES += \
         xpcom/io/nsLocalFileUnix.cpp
@@ -1101 +1101 @@
         $(TARGET_VBoxXPCOMGlue_s)
 
-ifeq ($(filter-out freebsd l4 linux netbsd openbsd,$(BUILD_TARGET)),) # gnu ld.
+ifeq ($(filter-out freebsd l4 linux netbsd openbsd,$(KBUILD_TARGET)),) # gnu ld.
 VBoxXPCOM_LDFLAGS = -Wl,--whole-archive \
         $(TARGET_VBox-xpcom-typelib) \
@@ -1149 +1149 @@
 TEMPLATE_XPCOMIPC_EXTENDS          = XPCOM
 TEMPLATE_XPCOMIPC_DEFS             = $(TEMPLATE_XPCOM_DEFS) BUILD_DCONNECT="1"
-ifeq ($(filter-out win os2,$(BUILD_TARGET)),)
+ifeq ($(filter-out win os2,$(KBUILD_TARGET)),)
  TEMPLATE_XPCOMIPC_DEFS           += IPC_DAEMON_APP_NAME=\"VBoxXPCOMIPCD.exe\"
 else
@@ -1208 +1208 @@
 VBoxXPCOMIPCC_TEMPLATE = XPCOMIPC
 VBoxXPCOMIPCC_NAME.os2 = VBoxIPCC
-ifneq ($(BUILD_TARGET),linux)
+ifneq ($(KBUILD_TARGET),linux)
 VBoxXPCOMIPCC_INST = $(INST_BIN)components/
 endif
@@ -1217 +1217 @@
         ipc/ipcd/client/src/ipcModuleFactory.cpp \
         ipc/ipcd/extensions/dconnect/src/ipcDConnectService.cpp
-ifeq ($(BUILD_TARGET),win)
+ifeq ($(KBUILD_TARGET),win)
 VBoxXPCOMIPCC_SOURCES += \
         ipc/ipcd/client/src/ipcConnectionWin.cpp
@@ -1241 +1241 @@
         ipc/ipcd/daemon/src/ipcModuleReg.cpp \
         ipc/ipcd/daemon/src/ipcCommandModule.cpp
-ifeq ($(BUILD_TARGET),win)
+ifeq ($(KBUILD_TARGET),win)
 VBoxXPCOMIPCD_SOURCES += \
         ipc/ipcd/daemon/src/ipcdWin.cpp