X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fserver%2FMakefile.am;h=2a723a6bdcc2db047b40c515ef6204e97ca4e726;hp=a41e93201499955c1c4f64c2aaa70e6ea2336640;hb=233ab439c7e31299324ef056fc8b21f048e1c93e;hpb=20e4e77cdf366dedac21ff5670c54291feadfc05;ds=sidebyside

diff --git a/src/server/Makefile.am b/src/server/Makefile.am
index a41e932014..2a723a6bdc 100644
--- a/src/server/Makefile.am
+++ b/src/server/Makefile.am
@@ -1,5 +1,40 @@
-INCLUDES = -I$(top_srcdir)/src/helper -I$(top_srcdir)/src/target -I$(top_srcdir)/src/flash $(all_includes)
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/src/helper \
+	-I$(top_srcdir)/src/target \
+	-I$(top_srcdir)/src/flash \
+	-I$(top_srcdir)/src/jtag  \
+	-DPKGLIBDIR=\"$(pkglibdir)\"
+
 METASOURCES = AUTO
-noinst_LIBRARIES = libserver.a
+noinst_LTLIBRARIES = libserver.la
 noinst_HEADERS = server.h telnet_server.h gdb_server.h
-libserver_a_SOURCES = server.c telnet_server.c gdb_server.c
+libserver_la_SOURCES = server.c telnet_server.c gdb_server.c
+
+if HTTPD
+libserver_la_SOURCES += httpd.c
+endif
+
+libserver_la_CFLAGS =
+if IS_MINGW
+# FD_* macros are sloppy with their signs on MinGW32 platform
+libserver_la_CFLAGS += -Wno-sign-compare
+endif
+
+# tcl server addons
+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
+
+MAINTAINERCLEANFILES = Makefile.in