X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fserver%2FMakefile.am;h=04d3035f452870fda945cd3721f88a6a6bc5cd1f;hp=b47b8d09e3c01e78bef0afdeed266408ced00259;hb=9a8edbfa8bd83d58a1904dfd35a00f9793d99314;hpb=34654359a918edae10ca7dd7ebc0a487fdf609a4

diff --git a/src/server/Makefile.am b/src/server/Makefile.am
index b47b8d09e3..04d3035f45 100644
--- a/src/server/Makefile.am
+++ b/src/server/Makefile.am
@@ -1,24 +1,11 @@
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/helper \
-	-I$(top_srcdir)/src/target \
-	-I$(top_srcdir)/src/flash \
-	-I$(top_srcdir)/src/jtag  \
-	-DPKGDATADIR=\"$(pkgdatadir)\"
+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
-else
-if !ECOSBOARD
 libserver_la_SOURCES += server_stubs.c
-endif
-endif
-noinst_HEADERS += httpd.h
 
 libserver_la_CFLAGS =
 if IS_MINGW
@@ -30,23 +17,7 @@ endif
 noinst_HEADERS += tcl_server.h
 libserver_la_SOURCES += tcl_server.c
 
-if HTTPD
-nobase_dist_pkgdata_DATA = \
-	$(wildcard \
-		$(srcdir)/httpd/*.tcl \
-		$(srcdir)/httpd/*.css \
-		$(srcdir)/httpd/menu_cuts/*.png \
-	)
-endif
-
 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
+	startup.tcl
 
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in