X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fserver%2FMakefile.am;h=804efac16dc2a9035a58e6c595ec3f837df4972f;hb=2f92598f0d6d8304a9c15f7050c9e888279cd2fa;hp=6e52fdfb88f5a3d4fdb64968f84ac8959158b1a8;hpb=4088b1e622cff0673f2859de5ee611da736bdba7;p=fw%2Fopenocd

diff --git a/src/server/Makefile.am b/src/server/Makefile.am
index 6e52fdfb8..804efac16 100644
--- a/src/server/Makefile.am
+++ b/src/server/Makefile.am
@@ -1,46 +1,19 @@
-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)\"
+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_LTLIBRARIES = libserver.la
-noinst_HEADERS = server.h telnet_server.h gdb_server.h
-libserver_la_SOURCES = server.c telnet_server.c gdb_server.c
-
-if HTTPD
-libserver_la_SOURCES += httpd.c
-endif
-
-libserver_la_CFLAGS =
+%C%_libserver_la_CFLAGS = $(AM_CFLAGS)
 if IS_MINGW
 # FD_* macros are sloppy with their signs on MinGW32 platform
-libserver_la_CFLAGS += -Wno-sign-compare
+%C%_libserver_la_CFLAGS += -Wno-sign-compare
 endif
 
-# tcl server addons
-noinst_HEADERS += tcl_server.h
-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
+STARTUP_TCL_SRCS += %D%/startup.tcl