+1
On 11/22/2011 01:10 PM, Eduardo Lima (Etrunko) wrote:
From: Eduardo Lima (Etrunko)<eblima(a)br.ibm.com>
Signed-off-by: Eduardo Lima (Etrunko)<eblima(a)br.ibm.com>
---
Makefile.am | 302 +++++++++++++++++++++++++++---------------------------
doc/Makefile.am | 4 +
2 files changed, 155 insertions(+), 151 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 5f004ec..94dc5f3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,171 +4,171 @@ AUTOMAKE_OPTIONS=dist-bzip2
SUBDIRS = libxkutil src doc base_schema
MOFS = \
- schema/ComputerSystem.mof \
- schema/LogicalDisk.mof \
- schema/NetworkPort.mof \
- schema/Memory.mof \
- schema/Processor.mof \
- schema/SystemDevice.mof \
- schema/Virt_VSSD.mof \
- schema/VSSD.mof \
- schema/HostSystem.mof \
- schema/HostedDependency.mof \
- schema/VirtualSystemManagementService.mof \
- schema/VirtualSystemManagementCapabilities.mof \
- schema/EnabledLogicalElementCapabilities.mof \
- schema/AllocationCapabilities.mof \
- schema/SettingsDefineCapabilities.mof \
- schema/MemoryPool.mof \
- schema/ElementCapabilities.mof \
- schema/ProcessorPool.mof \
- schema/DiskPool.mof \
- schema/HostedResourcePool.mof \
- schema/RegisteredProfile.mof \
- schema/ElementConformsToProfile.mof \
- schema/ComputerSystemIndication.mof \
- schema/ResourceAllocationSettingDataIndication.mof \
- schema/SwitchService.mof \
- schema/ComputerSystemMigrationIndication.mof \
- schema/Virt_ResourceAllocationSettingData.mof \
- schema/ResourceAllocationSettingData.mof \
- schema/ResourcePoolConfigurationService.mof \
- schema/ResourcePoolConfigurationCapabilities.mof \
- schema/VSSDComponent.mof \
- schema/SettingsDefineState.mof \
- schema/NetPool.mof \
- schema/ResourceAllocationFromPool.mof \
- schema/ElementAllocatedFromPool.mof \
- schema/HostedService.mof \
- schema/ElementSettingData.mof \
- schema/VSMigrationCapabilities.mof \
- schema/VSMigrationService.mof \
- schema/VSMigrationSettingData.mof \
- schema/VirtualSystemSnapshotService.mof \
- schema/VirtualSystemSnapshotServiceCapabilities.mof \
- schema/ConcreteComponent.mof \
- schema/ConsoleRedirectionService.mof \
- schema/ConsoleRedirectionServiceCapabilities.mof \
- schema/ServiceAffectsElement.mof \
- schema/KVMRedirectionSAP.mof \
- schema/DisplayController.mof \
- schema/PointingDevice.mof \
- schema/GraphicsPool.mof \
- schema/InputPool.mof \
- schema/HostedAccessPoint.mof \
- schema/ServiceAccessBySAP.mof \
- schema/SAPAvailableForElement.mof \
- schema/FilterEntry.mof \
- schema/FilterList.mof \
- schema/EntriesInFilterList.mof \
- schema/NestedFilterList.mof \
- schema/AppliedFilterList.mof \
- schema/HostedFilterList.mof
+ $(top_srcdir)/schema/ComputerSystem.mof \
+ $(top_srcdir)/schema/LogicalDisk.mof \
+ $(top_srcdir)/schema/NetworkPort.mof \
+ $(top_srcdir)/schema/Memory.mof \
+ $(top_srcdir)/schema/Processor.mof \
+ $(top_srcdir)/schema/SystemDevice.mof \
+ $(top_srcdir)/schema/Virt_VSSD.mof \
+ $(top_srcdir)/schema/VSSD.mof \
+ $(top_srcdir)/schema/HostSystem.mof \
+ $(top_srcdir)/schema/HostedDependency.mof \
+ $(top_srcdir)/schema/VirtualSystemManagementService.mof \
+ $(top_srcdir)/schema/VirtualSystemManagementCapabilities.mof \
+ $(top_srcdir)/schema/EnabledLogicalElementCapabilities.mof \
+ $(top_srcdir)/schema/AllocationCapabilities.mof \
+ $(top_srcdir)/schema/SettingsDefineCapabilities.mof \
+ $(top_srcdir)/schema/MemoryPool.mof \
+ $(top_srcdir)/schema/ElementCapabilities.mof \
+ $(top_srcdir)/schema/ProcessorPool.mof \
+ $(top_srcdir)/schema/DiskPool.mof \
+ $(top_srcdir)/schema/HostedResourcePool.mof \
+ $(top_srcdir)/schema/RegisteredProfile.mof \
+ $(top_srcdir)/schema/ElementConformsToProfile.mof \
+ $(top_srcdir)/schema/ComputerSystemIndication.mof \
+ $(top_srcdir)/schema/ResourceAllocationSettingDataIndication.mof \
+ $(top_srcdir)/schema/SwitchService.mof \
+ $(top_srcdir)/schema/ComputerSystemMigrationIndication.mof \
+ $(top_srcdir)/schema/Virt_ResourceAllocationSettingData.mof \
+ $(top_srcdir)/schema/ResourceAllocationSettingData.mof \
+ $(top_srcdir)/schema/ResourcePoolConfigurationService.mof \
+ $(top_srcdir)/schema/ResourcePoolConfigurationCapabilities.mof \
+ $(top_srcdir)/schema/VSSDComponent.mof \
+ $(top_srcdir)/schema/SettingsDefineState.mof \
+ $(top_srcdir)/schema/NetPool.mof \
+ $(top_srcdir)/schema/ResourceAllocationFromPool.mof \
+ $(top_srcdir)/schema/ElementAllocatedFromPool.mof \
+ $(top_srcdir)/schema/HostedService.mof \
+ $(top_srcdir)/schema/ElementSettingData.mof \
+ $(top_srcdir)/schema/VSMigrationCapabilities.mof \
+ $(top_srcdir)/schema/VSMigrationService.mof \
+ $(top_srcdir)/schema/VSMigrationSettingData.mof \
+ $(top_srcdir)/schema/VirtualSystemSnapshotService.mof \
+ $(top_srcdir)/schema/VirtualSystemSnapshotServiceCapabilities.mof \
+ $(top_srcdir)/schema/ConcreteComponent.mof \
+ $(top_srcdir)/schema/ConsoleRedirectionService.mof \
+ $(top_srcdir)/schema/ConsoleRedirectionServiceCapabilities.mof \
+ $(top_srcdir)/schema/ServiceAffectsElement.mof \
+ $(top_srcdir)/schema/KVMRedirectionSAP.mof \
+ $(top_srcdir)/schema/DisplayController.mof \
+ $(top_srcdir)/schema/PointingDevice.mof \
+ $(top_srcdir)/schema/GraphicsPool.mof \
+ $(top_srcdir)/schema/InputPool.mof \
+ $(top_srcdir)/schema/HostedAccessPoint.mof \
+ $(top_srcdir)/schema/ServiceAccessBySAP.mof \
+ $(top_srcdir)/schema/SAPAvailableForElement.mof \
+ $(top_srcdir)/schema/FilterEntry.mof \
+ $(top_srcdir)/schema/FilterList.mof \
+ $(top_srcdir)/schema/EntriesInFilterList.mof \
+ $(top_srcdir)/schema/NestedFilterList.mof \
+ $(top_srcdir)/schema/AppliedFilterList.mof \
+ $(top_srcdir)/schema/HostedFilterList.mof
INTEROP_MOFS = \
- schema/ComputerSystem.mof \
- schema/HostSystem.mof \
- schema/RegisteredProfile.mof \
- schema/DiskPool.mof \
- schema/MemoryPool.mof \
- schema/NetPool.mof \
- schema/ProcessorPool.mof \
- schema/VSMigrationService.mof \
- schema/ElementConformsToProfile.mof \
- schema/ReferencedProfile.mof \
- schema/AllocationCapabilities.mof
+ $(top_srcdir)/schema/ComputerSystem.mof \
+ $(top_srcdir)/schema/HostSystem.mof \
+ $(top_srcdir)/schema/RegisteredProfile.mof \
+ $(top_srcdir)/schema/DiskPool.mof \
+ $(top_srcdir)/schema/MemoryPool.mof \
+ $(top_srcdir)/schema/NetPool.mof \
+ $(top_srcdir)/schema/ProcessorPool.mof \
+ $(top_srcdir)/schema/VSMigrationService.mof \
+ $(top_srcdir)/schema/ElementConformsToProfile.mof \
+ $(top_srcdir)/schema/ReferencedProfile.mof \
+ $(top_srcdir)/schema/AllocationCapabilities.mof
PGINTEROP_MOFS = \
- schema/RegisteredProfile.mof \
- schema/ElementConformsToProfile.mof \
- schema/ReferencedProfile.mof
+ $(top_srcdir)/schema/RegisteredProfile.mof \
+ $(top_srcdir)/schema/ElementConformsToProfile.mof \
+ $(top_srcdir)/schema/ReferencedProfile.mof
CIMV2_MOFS = \
- schema/HostedResourcePool.mof \
- schema/ElementCapabilities.mof \
- schema/HostedService.mof \
- schema/HostedDependency.mof \
- schema/RegisteredProfile.mof \
- schema/ComputerSystem.mof \
- schema/ElementConformsToProfile.mof \
- schema/HostedAccessPoint.mof
+ $(top_srcdir)/schema/HostedResourcePool.mof \
+ $(top_srcdir)/schema/ElementCapabilities.mof \
+ $(top_srcdir)/schema/HostedService.mof \
+ $(top_srcdir)/schema/HostedDependency.mof \
+ $(top_srcdir)/schema/RegisteredProfile.mof \
+ $(top_srcdir)/schema/ComputerSystem.mof \
+ $(top_srcdir)/schema/ElementConformsToProfile.mof \
+ $(top_srcdir)/schema/HostedAccessPoint.mof
REGS = \
- schema/ComputerSystem.registration \
- schema/LogicalDisk.registration \
- schema/NetworkPort.registration \
- schema/Memory.registration \
- schema/Processor.registration \
- schema/SystemDevice.registration \
- schema/VSSD.registration \
- schema/HostSystem.registration \
- schema/HostedDependency.registration \
- schema/VirtualSystemManagementService.registration \
- schema/VirtualSystemManagementCapabilities.registration \
- schema/EnabledLogicalElementCapabilities.registration \
- schema/AllocationCapabilities.registration \
- schema/SettingsDefineCapabilities.registration \
- schema/MemoryPool.registration \
- schema/ElementCapabilities.registration \
- schema/ProcessorPool.registration \
- schema/DiskPool.registration \
- schema/HostedResourcePool.registration \
- schema/ComputerSystemIndication.registration \
- schema/ResourceAllocationSettingDataIndication.registration \
- schema/SwitchService.registration \
- schema/ComputerSystemMigrationIndication.registration \
- schema/ResourceAllocationSettingData.registration \
- schema/ResourcePoolConfigurationService.registration \
- schema/ResourcePoolConfigurationCapabilities.registration \
- schema/VSSDComponent.registration \
- schema/SettingsDefineState.registration \
- schema/NetPool.registration \
- schema/ResourceAllocationFromPool.registration \
- schema/ElementAllocatedFromPool.registration \
- schema/HostedService.registration \
- schema/ElementSettingData.registration \
- schema/VSMigrationCapabilities.registration \
- schema/VSMigrationService.registration \
- schema/ElementConformsToProfile.registration \
- schema/VSMigrationSettingData.registration \
- schema/VirtualSystemSnapshotService.registration \
- schema/VirtualSystemSnapshotServiceCapabilities.registration \
- schema/ConcreteComponent.registration \
- schema/ConsoleRedirectionService.registration \
- schema/ConsoleRedirectionServiceCapabilities.registration \
- schema/ServiceAffectsElement.registration \
- schema/KVMRedirectionSAP.registration \
- schema/DisplayController.registration \
- schema/PointingDevice.registration \
- schema/GraphicsPool.registration \
- schema/InputPool.registration \
- schema/HostedAccessPoint.registration \
- schema/ServiceAccessBySAP.registration \
- schema/SAPAvailableForElement.registration \
- schema/FilterEntry.registration \
- schema/FilterList.registration \
- schema/EntriesInFilterList.registration \
- schema/NestedFilterList.registration \
- schema/AppliedFilterList.registration \
- schema/HostedFilterList.registration
+ $(top_srcdir)/schema/ComputerSystem.registration \
+ $(top_srcdir)/schema/LogicalDisk.registration \
+ $(top_srcdir)/schema/NetworkPort.registration \
+ $(top_srcdir)/schema/Memory.registration \
+ $(top_srcdir)/schema/Processor.registration \
+ $(top_srcdir)/schema/SystemDevice.registration \
+ $(top_srcdir)/schema/VSSD.registration \
+ $(top_srcdir)/schema/HostSystem.registration \
+ $(top_srcdir)/schema/HostedDependency.registration \
+ $(top_srcdir)/schema/VirtualSystemManagementService.registration \
+ $(top_srcdir)/schema/VirtualSystemManagementCapabilities.registration \
+ $(top_srcdir)/schema/EnabledLogicalElementCapabilities.registration \
+ $(top_srcdir)/schema/AllocationCapabilities.registration \
+ $(top_srcdir)/schema/SettingsDefineCapabilities.registration \
+ $(top_srcdir)/schema/MemoryPool.registration \
+ $(top_srcdir)/schema/ElementCapabilities.registration \
+ $(top_srcdir)/schema/ProcessorPool.registration \
+ $(top_srcdir)/schema/DiskPool.registration \
+ $(top_srcdir)/schema/HostedResourcePool.registration \
+ $(top_srcdir)/schema/ComputerSystemIndication.registration \
+ $(top_srcdir)/schema/ResourceAllocationSettingDataIndication.registration \
+ $(top_srcdir)/schema/SwitchService.registration \
+ $(top_srcdir)/schema/ComputerSystemMigrationIndication.registration \
+ $(top_srcdir)/schema/ResourceAllocationSettingData.registration \
+ $(top_srcdir)/schema/ResourcePoolConfigurationService.registration \
+ $(top_srcdir)/schema/ResourcePoolConfigurationCapabilities.registration \
+ $(top_srcdir)/schema/VSSDComponent.registration \
+ $(top_srcdir)/schema/SettingsDefineState.registration \
+ $(top_srcdir)/schema/NetPool.registration \
+ $(top_srcdir)/schema/ResourceAllocationFromPool.registration \
+ $(top_srcdir)/schema/ElementAllocatedFromPool.registration \
+ $(top_srcdir)/schema/HostedService.registration \
+ $(top_srcdir)/schema/ElementSettingData.registration \
+ $(top_srcdir)/schema/VSMigrationCapabilities.registration \
+ $(top_srcdir)/schema/VSMigrationService.registration \
+ $(top_srcdir)/schema/ElementConformsToProfile.registration \
+ $(top_srcdir)/schema/VSMigrationSettingData.registration \
+ $(top_srcdir)/schema/VirtualSystemSnapshotService.registration \
+ $(top_srcdir)/schema/VirtualSystemSnapshotServiceCapabilities.registration \
+ $(top_srcdir)/schema/ConcreteComponent.registration \
+ $(top_srcdir)/schema/ConsoleRedirectionService.registration \
+ $(top_srcdir)/schema/ConsoleRedirectionServiceCapabilities.registration \
+ $(top_srcdir)/schema/ServiceAffectsElement.registration \
+ $(top_srcdir)/schema/KVMRedirectionSAP.registration \
+ $(top_srcdir)/schema/DisplayController.registration \
+ $(top_srcdir)/schema/PointingDevice.registration \
+ $(top_srcdir)/schema/GraphicsPool.registration \
+ $(top_srcdir)/schema/InputPool.registration \
+ $(top_srcdir)/schema/HostedAccessPoint.registration \
+ $(top_srcdir)/schema/ServiceAccessBySAP.registration \
+ $(top_srcdir)/schema/SAPAvailableForElement.registration \
+ $(top_srcdir)/schema/FilterEntry.registration \
+ $(top_srcdir)/schema/FilterList.registration \
+ $(top_srcdir)/schema/EntriesInFilterList.registration \
+ $(top_srcdir)/schema/NestedFilterList.registration \
+ $(top_srcdir)/schema/AppliedFilterList.registration \
+ $(top_srcdir)/schema/HostedFilterList.registration
INTEROP_REGS = \
- schema/RegisteredProfile.registration \
- schema/ElementConformsToProfile.registration \
- schema/ReferencedProfile.registration
+ $(top_srcdir)/schema/RegisteredProfile.registration \
+ $(top_srcdir)/schema/ElementConformsToProfile.registration \
+ $(top_srcdir)/schema/ReferencedProfile.registration
PGINTEROP_REGS = \
- schema/RegisteredProfile.registration \
- schema/ElementConformsToProfile.registration \
- schema/ReferencedProfile.registration
+ $(top_srcdir)/schema/RegisteredProfile.registration \
+ $(top_srcdir)/schema/ElementConformsToProfile.registration \
+ $(top_srcdir)/schema/ReferencedProfile.registration
CIMV2_REGS = \
- schema/HostedResourcePool.registration \
- schema/ElementCapabilities.registration \
- schema/HostedService.registration \
- schema/HostedDependency.registration \
- schema/ElementConformsToProfile.registration \
- schema/HostedAccessPoint.registration
+ $(top_srcdir)/schema/HostedResourcePool.registration \
+ $(top_srcdir)/schema/ElementCapabilities.registration \
+ $(top_srcdir)/schema/HostedService.registration \
+ $(top_srcdir)/schema/HostedDependency.registration \
+ $(top_srcdir)/schema/ElementConformsToProfile.registration \
+ $(top_srcdir)/schema/HostedAccessPoint.registration
pkgdata_SCRIPTS = provider-register.sh
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 222f192..cd9232c 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -20,4 +20,8 @@ install-data-local:
$(mkinstalldirs) $(DESTDIR)$(HTML_DIR)
@INSTALL@ -m 0644 $(srcdir)/*.html $(DESTDIR)$(HTML_DIR)
+uninstall-local:
+ rm -f $(DESTDIR)$(HTML_DIR)/*.html
+ rmdir $(DESTDIR)$(HTML_DIR)
+
all: $(WEB_PAGES)
--
Chip Vincent
Open Virtualization
IBM Linux Technology Center
cvincent(a)linux.vnet.ibm.com