X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fserver%2FMakefile.am;h=04d3035f452870fda945cd3721f88a6a6bc5cd1f;hp=4c8a3dce1477a0604ba3a9af97b73cfa385b3ffc;hb=4264431824f1e3c5fdd7e5fb417c4edad5aa3343;hpb=647e61cc6d9b13dd2799d2302ce9289a1627e36c

diff --git a/src/server/Makefile.am b/src/server/Makefile.am
index 4c8a3dce14..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,8 +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 = \
+	startup.tcl
 
-MAINTAINERCLEANFILES = Makefile.in
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in