server: read/write now goes through connection fn's

[fw/openocd] / src / server / Makefile.am

diff --git a/src/server/Makefile.am b/src/server/Makefile.am
index 4c8a3dce1477a0604ba3a9af97b73cfa385b3ffc..c6c946f0b0e86be386e8bfb9af4ae0806f6267a4 100644 (file)
--- a/src/server/Makefile.am
+++ b/src/server/Makefile.am
@@ -1,9 +1,7 @@
 AM_CPPFLAGS = \
-       -I$(top_srcdir)/src/helper \
-       -I$(top_srcdir)/src/target \
-       -I$(top_srcdir)/src/flash \
-       -I$(top_srcdir)/src/jtag  \
-       -DPKGLIBDIR=\"$(pkglibdir)\"
+       -I$(top_srcdir)/src \
+       -I$(top_builddir)/src \
+       -DPKGDATADIR=\"$(pkgdatadir)\"
 
 METASOURCES = AUTO
 noinst_LTLIBRARIES = libserver.la
@@ -12,7 +10,13 @@ libserver_la_SOURCES = server.c telnet_server.c gdb_server.c
 
 if HTTPD
 libserver_la_SOURCES += httpd.c
+else
+libserver_la_SOURCES += httpd_stubs.c
+if !ECOSBOARD
+libserver_la_SOURCES += server_stubs.c
 endif
+endif
+noinst_HEADERS += httpd.h
 
 libserver_la_CFLAGS =
 if IS_MINGW
@@ -25,7 +29,22 @@ noinst_HEADERS += tcl_server.h
 libserver_la_SOURCES += tcl_server.c
 
 if HTTPD
-nobase_dist_pkglib_DATA = $(wildcard $(srcdir)/httpd/*.tcl $(srcdir)/httpd/*.css $(srcdir)/httpd/menu_cuts/*.png)
+nobase_dist_pkgdata_DATA = \
+       $(wildcard \
+               $(srcdir)/httpd/*.tcl \
+               $(srcdir)/httpd/*.css \
+               $(srcdir)/httpd/menu_cuts/*.png \
+       )
 endif
 
-MAINTAINERCLEANFILES = Makefile.in
+EXTRA_DIST = \
+       startup.tcl \
+       httpd/readme.txt \
+       httpd/menu.xml \
+       httpd/menu.xsl \
+       httpd/build.sh \
+       httpd/html2tcl.sh \
+       httpd/Stylizer.java \
+       httpd/Stylizer.class
+
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in