X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fserver%2FMakefile.am;h=804efac16dc2a9035a58e6c595ec3f837df4972f;hb=5c941edc7b0d6e0bed596293d81867453d1462e9;hp=34957a6d7b673865440f66fba8b304e94e96b7cd;hpb=66add57aa5bae147b7996840a2287f3547b4b8ea;p=fw%2Fopenocd

diff --git a/src/server/Makefile.am b/src/server/Makefile.am
index 34957a6d7..804efac16 100644
--- a/src/server/Makefile.am
+++ b/src/server/Makefile.am
@@ -1,31 +1,19 @@
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/src/helper \
-	-I$(top_srcdir)/src/target \
-	-I$(top_srcdir)/src/flash \
-	-I$(top_srcdir)/src/jtag  \
-	-DPKGLIBDIR=\"$(pkglibdir)\"
+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
 
-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 =
+%C%_libserver_la_CFLAGS = $(AM_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)
+%C%_libserver_la_CFLAGS += -Wno-sign-compare
 endif
 
-MAINTAINERCLEANFILES = Makefile.in
+STARTUP_TCL_SRCS += %D%/startup.tcl