Changeset 98191 in vbox for trunk/src/VBox/Additions

Timestamp:

Jan 22, 2023 12:29:57 AM (2 years ago)

Author:

vboxsync

Message:

Add/linux/lightdm-greeter: Build fixes and switching templates (partially untested as the code doesn't compile on even a 4-5 year old distro any more). bugref:10348

Location:

trunk/src/VBox/Additions/linux/lightdm-greeter

Files:

• Makefile.kmk (modified) (2 diffs)
• liblightdm-gobject-1.5.0/Makefile.kmk (modified) (2 diffs)

trunk/src/VBox/Additions/linux/lightdm-greeter/Makefile.kmk

@@ -2 +2 @@
 ## @file
 # Makefile for VBox LightDM greeter for providing automated logons.
+#
+# Note! This isn't compiled any more. Remove?
 #
 
@@ -43 +45 @@
 # The greeter module.
 PROGRAMS += vbox-greeter
-vbox-greeter_TEMPLATE = VBOXGUESTR3EXE
+vbox-greeter_TEMPLATE = VBoxGuestR3Exe
 vbox-greeter_SDKS     = VBoxGlib20WithIo
 vbox-greeter_DEFS     = LOG_TO_BACKDOOR VBOX_WITH_HGCM
-vbox-greeter_DEFS    += \
-        VBOX_BUILD_TARGET=\"$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)\"
+ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
+ vbox-greeter_DEFS   += VBOX_BUILD_TARGET="$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)"
+else
+ vbox-greeter_DEFS   += VBOX_BUILD_TARGET=\"$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)\"
+endif
 vbox-greeter_DEFS    += \
         $(if $(VBOX_WITH_GUEST_PROPS),VBOX_WITH_GUEST_PROPS,) \

trunk/src/VBox/Additions/linux/lightdm-greeter/liblightdm-gobject-1.5.0/Makefile.kmk

@@ -32 +32 @@
 LIBRARIES += VBox-liblightdm-gobject
 
-VBox-liblightdm-gobject_TEMPLATE = VBOXGUESTR3NPLIB
+VBox-liblightdm-gobject_TEMPLATE = VBoxGuestR3Lib
 VBox-liblightdm-gobject_SDKS = VBoxGlib20WithIo
 VBox-liblightdm-gobject_INCS = \
@@ -39 +39 @@
         /usr/lib/x86_64-linux-gnu/glib-2.0/include \
         /usr/include/gio-unix-2.0
-VBox-liblightdm-gobject_DEFS = \
-        CONFIG_DIR=\"/etc/lightdm\" \
-        XSESSIONS_DIR=\"/usr/share/xsessions\" \
-        REMOTE_SESSIONS_DIR=\"/usr/share/lightdm/remote-sessions\"
+ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
+ VBox-liblightdm-gobject_DEFS = \
+        CONFIG_DIR="/etc/lightdm" \
+        XSESSIONS_DIR="/usr/share/xsessions" \
+        REMOTE_SESSIONS_DIR="/usr/share/lightdm/remote-sessions"
+else
+ VBox-liblightdm-gobject_DEFS = \
+        CONFIG_DIR=\"/etc/lightdm\" \
+        XSESSIONS_DIR=\"/usr/share/xsessions\" \
+        REMOTE_SESSIONS_DIR=\"/usr/share/lightdm/remote-sessions\"
+endif
 VBox-liblightdm-gobject_SOURCES = \
         greeter.c \