projects
/
fw
/
openocd
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 17e067d2e2e40708f98bb0e61a51d667775e9fdb..c6c946f0b0e86be386e8bfb9af4ae0806f6267a4 100644
(file)
--- a/
src/server/Makefile.am
+++ b/
src/server/Makefile.am
@@
-1,8
+1,6
@@
AM_CPPFLAGS = \
AM_CPPFLAGS = \
- -I$(top_srcdir)/src/helper \
- -I$(top_srcdir)/src/target \
- -I$(top_srcdir)/src/flash \
- -I$(top_srcdir)/src/jtag \
+ -I$(top_srcdir)/src \
+ -I$(top_builddir)/src \
-DPKGDATADIR=\"$(pkgdatadir)\"
METASOURCES = AUTO
-DPKGDATADIR=\"$(pkgdatadir)\"
METASOURCES = AUTO
@@
-12,7
+10,13
@@
libserver_la_SOURCES = server.c telnet_server.c gdb_server.c
if HTTPD
libserver_la_SOURCES += httpd.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
+endif
+noinst_HEADERS += httpd.h
libserver_la_CFLAGS =
if IS_MINGW
libserver_la_CFLAGS =
if IS_MINGW
@@
-34,6
+38,7
@@
nobase_dist_pkgdata_DATA = \
endif
EXTRA_DIST = \
endif
EXTRA_DIST = \
+ startup.tcl \
httpd/readme.txt \
httpd/menu.xml \
httpd/menu.xsl \
httpd/readme.txt \
httpd/menu.xml \
httpd/menu.xsl \
@@
-42,4
+47,4
@@
EXTRA_DIST = \
httpd/Stylizer.java \
httpd/Stylizer.class
httpd/Stylizer.java \
httpd/Stylizer.class
-MAINTAINERCLEANFILES = Makefile.in
+MAINTAINERCLEANFILES =
$(srcdir)/
Makefile.in