summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authordenise.eckstein <denise.eckstein>2005-08-19 22:50:20 +0000
committerdenise.eckstein <denise.eckstein>2005-08-19 22:50:20 +0000
commit29127fe491698a17b5af457ed9d8284c90fdfb09 (patch)
tree1d4ac22b7de0fa63b4ce2ff1f7c99a60c1446dbc /src
parent37c605b78435656d07a4749fc8d3000dab4786df (diff)
downloadtog-pegasus-29127fe491698a17b5af457ed9d8284c90fdfb09.zip
tog-pegasus-29127fe491698a17b5af457ed9d8284c90fdfb09.tar.gz
tog-pegasus-29127fe491698a17b5af457ed9d8284c90fdfb09.tar.xz
BUG#: 4113
TITLE: OpenVMS - Nightly build fails when PEGASUS_DISABLE_CQL set DESCRIPTION: Restored originally ordering.
Diffstat (limited to 'src')
-rw-r--r--src/Pegasus/ProviderManager2/CMPI/Makefile6
-rw-r--r--src/Pegasus/ProviderManager2/Default/Makefile12
-rw-r--r--src/Server/Makefile24
3 files changed, 27 insertions, 15 deletions
diff --git a/src/Pegasus/ProviderManager2/CMPI/Makefile b/src/Pegasus/ProviderManager2/CMPI/Makefile
index a11f0eb..6a55cad 100644
--- a/src/Pegasus/ProviderManager2/CMPI/Makefile
+++ b/src/Pegasus/ProviderManager2/CMPI/Makefile
@@ -49,14 +49,16 @@ LIBRARIES = \
pegclient \
pegquerycommon \
pegconfig \
- pegwql \
- pegcommon
+ pegwql
ifndef PEGASUS_DISABLE_CQL
LIBRARIES += \
pegcql
endif
+LIBRARIES += \
+ pegcommon
+
SOURCES = \
CMPIProviderManagerMain.cpp \
CMPIProviderManager.cpp \
diff --git a/src/Pegasus/ProviderManager2/Default/Makefile b/src/Pegasus/ProviderManager2/Default/Makefile
index 66de80d..3cd606b 100644
--- a/src/Pegasus/ProviderManager2/Default/Makefile
+++ b/src/Pegasus/ProviderManager2/Default/Makefile
@@ -41,17 +41,19 @@ LIBRARY = DefaultProviderManager
LIBRARIES = \
pegprovider \
pegprovidermanager \
- pegqueryexpression \
- pegwql \
- pegquerycommon \
- pegconfig \
- pegcommon
+ pegqueryexpression
ifndef PEGASUS_DISABLE_CQL
LIBRARIES += \
pegcql
endif
+LIBRARIES += \
+ pegwql \
+ pegquerycommon \
+ pegconfig \
+ pegcommon
+
SOURCES = \
DefaultProviderManagerMain.cpp \
DefaultProviderManager.cpp \
diff --git a/src/Server/Makefile b/src/Server/Makefile
index 5a3da61..3ad8d9e 100644
--- a/src/Server/Makefile
+++ b/src/Server/Makefile
@@ -43,9 +43,23 @@ LIBRARIES = \
ProviderRegistrationProvider \
pegauthentication \
UserAuthProvider \
- pegqueryexpression \
+ pegqueryexpression
+
+ifndef PEGASUS_DISABLE_CQL
+ LIBRARIES += \
+ pegcql
+endif
+
+LIBRARIES += \
pegquerycommon \
- pegwql \
+ pegwql
+
+ifndef PEGASUS_DISABLE_CQL
+ LIBRARIES += \
+ CIMQueryCapabilitiesProvider
+endif
+
+LIBRARIES += \
pegprovidermanager \
pegprovider \
pegexportserver \
@@ -54,12 +68,6 @@ LIBRARIES = \
pegcommon \
pegservice
-ifndef PEGASUS_DISABLE_CQL
- LIBRARIES += \
- pegcql \
- CIMQueryCapabilitiesProvider
-endif
-
ifndef PEGASUS_DISABLE_PERFINST
LIBRARIES += \
CIMOMStatDataProvider \