X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fserver%2FMakefile.am;h=04d3035f452870fda945cd3721f88a6a6bc5cd1f;hb=1d1f1b95a7516af3ce845c79af73511c82035528;hp=2a723a6bdcc2db047b40c515ef6204e97ca4e726;hpb=233ab439c7e31299324ef056fc8b21f048e1c93e;p=openocd.git

diff --git a/src/server/Makefile.am b/src/server/Makefile.am
index 2a723a6bdc..04d3035f45 100644
--- a/src/server/Makefile.am
+++ b/src/server/Makefile.am
@@ -1,18 +1,11 @@
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/src/helper \
-	-I$(top_srcdir)/src/target \
-	-I$(top_srcdir)/src/flash \
-	-I$(top_srcdir)/src/jtag  \
-	-DPKGLIBDIR=\"$(pkglibdir)\"
+include $(top_srcdir)/common.mk
 
 METASOURCES = AUTO
 noinst_LTLIBRARIES = libserver.la
 noinst_HEADERS = server.h telnet_server.h gdb_server.h
 libserver_la_SOURCES = server.c telnet_server.c gdb_server.c
 
-if HTTPD
-libserver_la_SOURCES += httpd.c
-endif
+libserver_la_SOURCES += server_stubs.c
 
 libserver_la_CFLAGS =
 if IS_MINGW
@@ -24,17 +17,7 @@ endif
 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)
-endif
-
 EXTRA_DIST = \
-	httpd/readme.txt \
-	httpd/menu.xml \
-	httpd/menu.xsl \
-	httpd/build.sh \
-	httpd/html2tcl.sh \
-	httpd/Stylizer.java \
-	httpd/Stylizer.class
+	startup.tcl
 
-MAINTAINERCLEANFILES = Makefile.in
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in