X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fserver%2FMakefile.am;h=2f0700757978aa1defecb142938d017e2c3d666f;hp=0e3a3a479076178e7c9512d8367898c89fe83b83;hb=d0dee7ccafcf87259fadf6c5de43df8583b0e885;hpb=0fc19255c365a59acf4683d177bacf662e84d4f1

diff --git a/src/server/Makefile.am b/src/server/Makefile.am
index 0e3a3a4790..2f07007579 100644
--- a/src/server/Makefile.am
+++ b/src/server/Makefile.am
@@ -1,14 +1,45 @@
-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  \
+	-DPKGDATADIR=\"$(pkgdatadir)\"
+
 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_a_SOURCES += httpd.c
+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_a_SOURCES += tcl_server.c
+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 = \
+	httpd/readme.txt \
+	httpd/menu.xml \
+	httpd/menu.xsl \
+	httpd/build.sh \
+	httpd/html2tcl.sh \
+	httpd/Stylizer.java \
+	httpd/Stylizer.class
+
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in