X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fserver%2FMakefile.am;h=34957a6d7b673865440f66fba8b304e94e96b7cd;hp=63bcc04300796379b8d41a200c601c631bf2b047;hb=66add57aa5bae147b7996840a2287f3547b4b8ea;hpb=2b673d0c1e190f76b1bd2c5a7f7f1242bd1c3d18

diff --git a/src/server/Makefile.am b/src/server/Makefile.am
index 63bcc04300..34957a6d7b 100644
--- a/src/server/Makefile.am
+++ b/src/server/Makefile.am
@@ -1,9 +1,31 @@
-INCLUDES = -I$(top_srcdir)/src/helper -I$(top_srcdir)/src/target -I$(top_srcdir)/src/flash -I$(top_srcdir)/src/jtag $(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_HEADERS = server.h telnet_server.h gdb_server.h
 libserver_a_SOURCES = server.c telnet_server.c gdb_server.c
 
+if HTTPD
+libserver_a_SOURCES += httpd.c
+endif
+
+libserver_a_CFLAGS =
+if IS_MINGW
+# FD_* macros are sloppy with their signs on MinGW32 platform
+libserver_a_CFLAGS += -Wno-sign-compare
+endif
+
 # tcl server addons
 noinst_HEADERS += tcl_server.h
 libserver_a_SOURCES += tcl_server.c
+
+if HTTPD
+nobase_dist_pkglib_DATA = $(wildcard $(srcdir)/httpd/*.tcl $(srcdir)/httpd/*.css $(srcdir)/httpd/menu_cuts/*.png)
+endif
+
+MAINTAINERCLEANFILES = Makefile.in