diff audioDB.cpp @ 371:5eb5034b0577

Proper dependency information for audioDB.cpp:

* invert #ifdef BINARY logic (use LIBRARY instead);
* have two separate object files;
* explicit makefile rule for audioDB_library.o;
* don't make tags in the "all" target

--- a/audioDB.cpp	Wed Nov 12 15:40:40 2008 +0000
+++ b/audioDB.cpp	Thu Nov 13 12:54:15 2008 +0000
@@ -41,11 +41,11 @@
     prefix_name((char** const)&dbName, adb_root);
 
   if(O2_ACTION(COM_SERVER))
-    #ifdef BINARY
+#ifdef LIBRARY
+    ;
+#else
     startServer();
-    #else
-    ;
-    #endif
+#endif
 
   else  if(O2_ACTION(COM_CREATE))
     create(dbName);
@@ -58,7 +58,9 @@
 
   else if(O2_ACTION(COM_QUERY))
     if(isClient){
-    #ifdef BINARY
+#ifdef LIBRARY
+      ;
+#else
       if(query_from_key){
 	VERB_LOG(1, "Calling web services query %s on database %s, query=%s\n", radius>0?"(Radius)":"(NN)", dbName, (key&&strlen(key))?key:inFile);
 	ws_query_by_key(dbName, key, inFile, (char*)hostport);	
@@ -67,20 +69,18 @@
 	VERB_LOG(1, "Calling web services query on database %s, query=%s\n", dbName, (key&&strlen(key))?key:inFile);
 	ws_query(dbName, inFile, (char*)hostport);
       }
-    #else
-    ;
-    #endif
+#endif
     }
     else
       query(dbName, inFile);
 
   else if(O2_ACTION(COM_STATUS))
     if(isClient)
-    #ifdef BINARY
+#ifdef LIBRARY
+      ;
+#else
       ws_status(dbName,(char*)hostport);
-    #else
-    ;
-    #endif
+#endif
     else
       status(dbName);
 
@@ -98,11 +98,11 @@
 
   else if(O2_ACTION(COM_LISZT))
     if(isClient)
-    #ifdef BINARY
+#ifdef LIBRARY
+      ;
+#else 
       ws_liszt(dbName, (char*) hostport);
-    #else
-    ;
-    #endif
+#endif
     else
       liszt(dbName, lisztOffset, lisztLength);