flash/stmqspi: fix build error with -Werror=maybe-uninitialized

[fw/openocd] / src / server / Makefile.am

diff --git a/src/server/Makefile.am b/src/server/Makefile.am
index 4c8a3dce1477a0604ba3a9af97b73cfa385b3ffc..d270ee2811f4cd5a19c0d7d919629d75ec8b4f3c 100644 (file)
--- a/src/server/Makefile.am
+++ b/src/server/Makefile.am
@@ -1,31 +1,21 @@
-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 \
+       %D%/rtt_server.c \
+       %D%/rtt_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
-endif
-
-# tcl server addons
-noinst_HEADERS += tcl_server.h
-libserver_la_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