X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fserver%2FMakefile.am;h=5f7469a8495db91f793037aa88f2e3046ea5fd7d;hb=15dd48119a3564df2ceb5512fc2b62ca42f43614;hp=89b5e364236c90ee2dfaa4e9ee2c4e8cae265dfb;hpb=6d3c1cd9728981919f2ff1bc1f48b2bbbcbc5224;p=fw%2Fopenocd

diff --git a/src/server/Makefile.am b/src/server/Makefile.am
index 89b5e3642..5f7469a84 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)
-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
+noinst_LTLIBRARIES += %D%/libserver.la
+%C%_libserver_la_SOURCES = \
+	%D%/server.c \
+	%D%/telnet_server.c \
+	%D%/gdb_server.c \
+	%D%/server.h \
+	%D%/telnet_server.h \
+	%D%/gdb_server.h \
+	%D%/server_stubs.c \
+	%D%/tcl_server.c \
+	%D%/tcl_server.h \
+	%D%/rtt_server.c \
+	%D%/rtt_server.h \
+	%D%/ipdbg.c \
+	%D%/ipdbg.h
 
-if HTTPD
-libserver_a_SOURCES += httpd.c
+%C%_libserver_la_CFLAGS = $(AM_CFLAGS)
+if IS_MINGW
+# FD_* macros are sloppy with their signs on MinGW32 platform
+%C%_libserver_la_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)
-nobase_dist_pkglib_DATA += $(wildcard $(srcdir)/httpd/*.css)
-nobase_dist_pkglib_DATA += $(wildcard $(srcdir)/httpd/menu_cuts/*.png)
-endif
-AM_CPPFLAGS = -DPKGLIBDIR=\"$(pkglibdir)\" @CPPFLAGS@
\ No newline at end of file
+STARTUP_TCL_SRCS += %D%/startup.tcl