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

diff --git a/src/server/Makefile.am b/src/server/Makefile.am
index 075e9560ef..989a682ce3 100644
--- a/src/server/Makefile.am
+++ b/src/server/Makefile.am
@@ -1,21 +1,53 @@
-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 \
+	-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
+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
+# 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_pkglib_DATA = $(wildcard $(srcdir)/httpd/*.tcl $(srcdir)/httpd/*.css $(srcdir)/httpd/menu_cuts/*.png)
+nobase_dist_pkgdata_DATA = \
+	$(wildcard \
+		$(srcdir)/httpd/*.tcl \
+		$(srcdir)/httpd/*.css \
+		$(srcdir)/httpd/menu_cuts/*.png \
+	)
 endif
-AM_CPPFLAGS = -DPKGLIBDIR=\"$(pkglibdir)\" @CPPFLAGS@
 
-MAINTAINERCLEANFILES = Makefile.in
+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
+
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in