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

diff --git a/src/server/Makefile.am b/src/server/Makefile.am
index 075e9560ef..04d3035f45 100644
--- a/src/server/Makefile.am
+++ b/src/server/Makefile.am
@@ -1,21 +1,23 @@
-INCLUDES = -I$(top_srcdir)/src/helper -I$(top_srcdir)/src/target -I$(top_srcdir)/src/flash -I$(top_srcdir)/src/jtag $(all_includes)
+include $(top_srcdir)/common.mk
+
 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
-endif
+libserver_la_SOURCES += server_stubs.c
 
+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)
-endif
-AM_CPPFLAGS = -DPKGLIBDIR=\"$(pkglibdir)\" @CPPFLAGS@
+EXTRA_DIST = \
+	startup.tcl
 
-MAINTAINERCLEANFILES = Makefile.in
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in