From: Katy Feng <fkaty@vmware.com>
Date: Fri, 23 Dec 2022 00:25:50 +0000 (-0800)
Subject: Source file changes not directly applicable to open-vm-tools.
X-Git-Tag: stable-12.2.0~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd63d8029852af847383f19cd13d62adcabaabaf;p=thirdparty%2Fopen-vm-tools.git

Source file changes not directly applicable to open-vm-tools.

Minor cleanup in a couple of Makefile.am files.
---

diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac
index 4d268f645..5c35356e6 100644
--- a/open-vm-tools/configure.ac
+++ b/open-vm-tools/configure.ac
@@ -1939,6 +1939,10 @@ AC_CONFIG_FILES([                      \
    libappmonitor/appmonitor.pc         \
 ])
 
+
+
+
+
 ###
 ### Output
 ###
diff --git a/open-vm-tools/lib/Makefile.am b/open-vm-tools/lib/Makefile.am
index 523e72317..ecbab81a7 100644
--- a/open-vm-tools/lib/Makefile.am
+++ b/open-vm-tools/lib/Makefile.am
@@ -1,5 +1,5 @@
 ################################################################################
-### Copyright (c) 2007-2016,2020-2021 VMware, Inc.  All rights reserved.
+### Copyright (c) 2007-2016,2020-2022 VMware, Inc.  All rights reserved.
 ###
 ### This program is free software; you can redistribute it and/or modify
 ### it under the terms of version 2 of the GNU General Public License as
@@ -77,3 +77,5 @@ SUBDIRS += vmCheck
 SUBDIRS += vmSignal
 SUBDIRS += wiper
 SUBDIRS += xdg
+
+
diff --git a/open-vm-tools/services/plugins/Makefile.am b/open-vm-tools/services/plugins/Makefile.am
index 9437f7e9a..ef57c3fb2 100644
--- a/open-vm-tools/services/plugins/Makefile.am
+++ b/open-vm-tools/services/plugins/Makefile.am
@@ -1,5 +1,5 @@
 ################################################################################
-### Copyright (c) 2009-2021 VMware, Inc.  All rights reserved.
+### Copyright (c) 2009-2022 VMware, Inc.  All rights reserved.
 ###
 ### This program is free software; you can redistribute it and/or modify
 ### it under the terms of version 2 of the GNU General Public License as
@@ -55,15 +55,20 @@ SUBDIRS += timeSync
 SUBDIRS += vix
 SUBDIRS += vmbackup
 
+
 #
 # plugin_LTLIBRARIES causes both .la and .so files to be installed to the
 # plugin directories. Clean up the .la files and keep just the shared
-# libraries around. Sometimes, even though we're passing "-shared" to
+# libraries around. Sometimes, even though we are passing "-shared" to
 # libtool, .a files are also generated, so clean up those too.
 #
+
+STATICLIBS = *.a
+LTLIBS = *.la
+
 install-exec-local:
-	rm -f $(DESTDIR)$(VMSVC_PLUGIN_INSTALLDIR)/*.a
-	rm -f $(DESTDIR)$(VMSVC_PLUGIN_INSTALLDIR)/*.la
-	rm -f $(DESTDIR)$(VMUSR_PLUGIN_INSTALLDIR)/*.a
-	rm -f $(DESTDIR)$(VMUSR_PLUGIN_INSTALLDIR)/*.la
+	rm -f $(DESTDIR)$(VMSVC_PLUGIN_INSTALLDIR)/$(STATICLIBS)
+	rm -f $(DESTDIR)$(VMSVC_PLUGIN_INSTALLDIR)/$(LTLIBS)
+	rm -f $(DESTDIR)$(VMUSR_PLUGIN_INSTALLDIR)/$(STATICLIBS)
+	rm -f $(DESTDIR)$(VMUSR_PLUGIN_INSTALLDIR)/$(LTLIBS)
 
diff --git a/open-vm-tools/tests/Makefile.am b/open-vm-tools/tests/Makefile.am
index a751ec75f..add08fd0f 100644
--- a/open-vm-tools/tests/Makefile.am
+++ b/open-vm-tools/tests/Makefile.am
@@ -1,5 +1,5 @@
 ################################################################################
-### Copyright (C) 2009-2016 VMware, Inc.  All rights reserved.
+### Copyright (c) 2009-2016,2022 VMware, Inc.  All rights reserved.
 ###
 ### This program is free software; you can redistribute it and/or modify
 ### it under the terms of version 2 of the GNU General Public License as
@@ -21,7 +21,12 @@ SUBDIRS += testDebug
 SUBDIRS += testPlugin
 SUBDIRS += testVmblock
 
-install-exec-local:
-	rm -f $(DESTDIR)$(TEST_PLUGIN_INSTALLDIR)/*.a
-	rm -f $(DESTDIR)$(TEST_PLUGIN_INSTALLDIR)/*.la
 
+
+
+STATICLIBS = *.a
+LTLIBS     = *.la
+
+install-exec-local:
+	rm -f $(DESTDIR)$(TEST_PLUGIN_INSTALLDIR)/$(STATICLIBS)
+	rm -f $(DESTDIR)$(TEST_PLUGIN_INSTALLDIR)/$(LTLIBS)