--- linuxsampler/trunk/src/network/Makefile.am	2004/05/23 19:16:33	80
+++ linuxsampler/trunk/src/network/Makefile.am	2007/04/16 15:51:18	1161
@@ -1,23 +1,32 @@
 INCLUDES = $(all_includes)
 METASOURCES = AUTO
 
-AM_CXXFLAGS = -ffast-math -march=$(target_cpu) -mcpu=$(target_cpu)
+AM_CXXFLAGS = -Wreturn-type -ffast-math $(CXX_CPU_SWITCH)
 
 noinst_LTLIBRARIES = liblinuxsamplernetwork.la
-liblinuxsamplernetwork_la_SOURCES = lscp.h lscpparser.cpp lscpparser.h lscpscanner.cpp lscpserver.cpp lscpserver.h lscpsymbols.h
+liblinuxsamplernetwork_la_SOURCES = \
+	lscp.h \
+	lscpparser.cpp lscpparser.h \
+	lscpserver.cpp lscpserver.h \
+	lscpsymbols.h \
+	lscpresultset.cpp lscpresultset.h \
+	lscpevent.cpp lscpevent.h
+
+EXTRA_DIST = lscp.y
 
 .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 -f 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; \
+	    echo -n "Updating Documentation/lscp.xml..." && \
+	    (cd ../../scripts/ && ./update_grammar.pl) && \
+	    echo "OK"; \
 	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;