X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fserver%2FMakefile.am;h=a7c318ce696b3016dbbe90a5486de0fc64f98d1d;hb=838cd58e24a18102b8a140df9fa993fe65706828;hp=989a682ce3147cb68e15a6ea58724e12a2a1f770;hpb=6ec526e706483cd2de6c8de4bafa885522a782cd;p=openocd.git

diff --git a/src/server/Makefile.am b/src/server/Makefile.am
index 989a682ce3..a7c318ce69 100644
--- a/src/server/Makefile.am
+++ b/src/server/Makefile.am
@@ -1,25 +1,13 @@
-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
-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
@@ -31,23 +19,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