view libtests/libtest.mk @ 405:ef4792df8f93 api-inversion

invert audioDB::insert / audiodb_insert().

Start off by removing audioDB::insertDatum, and essentially reusing it
as audiodb_insert.  We now ignore the fact that the command-line parsing
code has "helpfully" opened a std::ifstream for the times file and an fd
for the power file, and simply go ahead and do our own dirty work.

We can delete audioDB::insertDatum entirely, but unfortunately we can't
delete audioDB::insertPowerData and audioDB::insertTimestamps, because
the index and query code respectively use them.  Instead, move the two
methods closer to their single uses.

audiodb_insert() is perhaps not as short and simple as it might have
been hoped given the existence of audiodb_insert_datum(); some of that
is C and its terribly way of making you pay every time you use dynamic
memory; some of it is the fact that the three different files (feature,
times, power) each requires slightly different treatment.  Hey ho.

We can implement audiodb_batchinsert() in terms of audiodb_insert(); the
function is pleasingly small.  We can't quite use it for
audioDB::batchinsert yet, as we have to deal with the O2_FLAG_LARGE_ADB
case (which codepath is untested in libtests/).

This means that we can delete whole swathes of hideous code from
audioDB.cpp, including not just the versions of audiodb_insert() and
audiodb_batchinsert() but also an entire audioDB constructor.  Yay.
(audioDB::unitNormAndInsertL2 has also died a deserved death).

EXECUTABLE=audioDB
SOVERSION=0
MINORVERSION=0
LIBRARY_FULL=lib$(EXECUTABLE).so.$(SOVERSION).$(MINORVERSION)
LIBRARY_VERS=lib$(EXECUTABLE).so.$(SOVERSION)
LIBRARY=lib$(EXECUTABLE).so
ARCH_FLAGS=


ifeq ($(shell uname),Darwin)
override LIBRARY_FULL=lib$(EXECUTABLE).$(SOVERSION).$(MINORVERSION).dylib
override LIBRARY_VERS=lib$(EXECUTABLE).$(SOVERSION).dylib
override LIBRARY=lib$(EXECUTABLE).dylib
ifeq ($(shell sysctl -n hw.optional.x86_64),1)
override ARCH_FLAGS+=-arch x86_64
endif
endif

all: $(LIBRARY_FULL) $(LIBRARY_VERS) $(LIBRARY) test1

$(LIBRARY_FULL):
	-ln -s ../../$(LIBRARY_FULL) $@

$(LIBRARY_VERS):
	-ln -s ../../$(LIBRARY_FULL) $@

$(LIBRARY): $(LIBRARY_VERS)
	-ln -s $< $@

test1: prog1.c ../test_utils_lib.h ../../audioDB_API.h
	gcc -g -std=c99 -Wall $(ARCH_FLAGS) -laudioDB -L. -Wl,-rpath,. -o $@ $<

clean:
	-rm $(LIBRARY_FULL) $(LIBRARY_VERS) $(LIBRARY)