--- linuxsampler/trunk/src/network/Makefile.am	2004/06/06 20:59:49	113
+++ linuxsampler/trunk/src/network/Makefile.am	2005/05/03 00:37:35	504
@@ -1,23 +1,28 @@
 INCLUDES = $(all_includes)
 METASOURCES = AUTO
 
-AM_CXXFLAGS = -ffast-math -march=$(target_cpu) -mcpu=$(target_cpu)
+AM_CXXFLAGS = -Wreturn-type -ffast-math -march=$(target_cpu)
+
+if HAVE_SQLITE3
+sqlite3_lflags = $(SQLITE3_LIBS)
+else
+sqlite3_lflags =
+endif
 
 noinst_LTLIBRARIES = liblinuxsamplernetwork.la
-liblinuxsamplernetwork_la_SOURCES = lscp.h lscpparser.cpp lscpparser.h lscpscanner.cpp lscpserver.cpp lscpserver.h lscpsymbols.h lscpresultset.cpp lscpresultset.h
+liblinuxsamplernetwork_la_SOURCES = lscp.h lscpparser.cpp lscpparser.h lscpserver.cpp lscpserver.h lscpsymbols.h lscpresultset.cpp lscpresultset.h lscpevent.cpp lscpevent.h lscpinstrumentloader.cpp
+liblinuxsamplernetwork_la_LIBADD = $(sqlite3_lflags)
 
 .PHONY: parser
 
 # generate parser with lex and yacc
 parser:
 	@echo "Generating LSCP parser..."
-	@if which "lex" > /dev/null && which "yacc" > /dev/null; then \
+	@if which "yacc" > /dev/null; then \
 	    yacc -d lscp.y && \
-	    lex --fast --8bit lscp.l && \
 	    yacc lscp.y && \
 	    mv -f y.tab.h lscpsymbols.h && \
-	    mv -f y.tab.c lscpparser.cpp && \
-	    mv -f lex.yy.c lscpscanner.cpp; \
+	    mv -f y.tab.c lscpparser.cpp; \
 	else \
-	    echo "You need lex (or flex) and yacc (or bison) to generate the parser."; \
+	    echo "You need yacc (or bison) to generate the parser."; \
 	fi;