X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fserver%2FMakefile.am;h=a7c318ce696b3016dbbe90a5486de0fc64f98d1d;hb=0c2f8b6eb8f4b379aa0c78caba73ec1ebaae8414;hp=c6c946f0b0e86be386e8bfb9af4ae0806f6267a4;hpb=eb1bc657ae10f9e21304e068ca17dc0231a9b9c0;p=fw%2Fopenocd

diff --git a/src/server/Makefile.am b/src/server/Makefile.am
index c6c946f0b..a7c318ce6 100644
--- a/src/server/Makefile.am
+++ b/src/server/Makefile.am
@@ -1,22 +1,13 @@
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/src \
-	-I$(top_builddir)/src \
-	-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
@@ -28,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