comparison 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

   // Perform database prefix substitution
   if(dbName && adb_root)
     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);
 
   else if(O2_ACTION(COM_INSERT))

   else if(O2_ACTION(COM_BATCHINSERT))
     batchinsert(dbName, inFile);
 
   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);	
       }
       else{
 	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);
 
   else if(O2_ACTION(COM_SAMPLE))
     sample(dbName);

   else if(O2_ACTION(COM_DUMP))
     dump(dbName);
 
   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);
 
   else if(O2_ACTION(COM_INDEX))
     index_index_db(dbName);