X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fserver%2FMakefile.am;h=989a682ce3147cb68e15a6ea58724e12a2a1f770;hb=26e4fac57e2e022409b63a444928a41399a0a76b;hp=2a723a6bdcc2db047b40c515ef6204e97ca4e726;hpb=233ab439c7e31299324ef056fc8b21f048e1c93e;p=openocd.git

diff --git a/src/server/Makefile.am b/src/server/Makefile.am
index 2a723a6bdc..989a682ce3 100644
--- a/src/server/Makefile.am
+++ b/src/server/Makefile.am
@@ -1,9 +1,10 @@
 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  \
-	-DPKGLIBDIR=\"$(pkglibdir)\"
+	-DPKGDATADIR=\"$(pkgdatadir)\"
 
 METASOURCES = AUTO
 noinst_LTLIBRARIES = libserver.la
@@ -12,7 +13,13 @@ libserver_la_SOURCES = server.c telnet_server.c gdb_server.c
 
 if HTTPD
 libserver_la_SOURCES += httpd.c
+else
+libserver_la_SOURCES += httpd_stubs.c
+if !ECOSBOARD
+libserver_la_SOURCES += server_stubs.c
 endif
+endif
+noinst_HEADERS += httpd.h
 
 libserver_la_CFLAGS =
 if IS_MINGW
@@ -25,10 +32,16 @@ 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)
+nobase_dist_pkgdata_DATA = \
+	$(wildcard \
+		$(srcdir)/httpd/*.tcl \
+		$(srcdir)/httpd/*.css \
+		$(srcdir)/httpd/menu_cuts/*.png \
+	)
 endif
 
 EXTRA_DIST = \
+	startup.tcl \
 	httpd/readme.txt \
 	httpd/menu.xml \
 	httpd/menu.xsl \
@@ -37,4 +50,4 @@ EXTRA_DIST = \
 	httpd/Stylizer.java \
 	httpd/Stylizer.class
 
-MAINTAINERCLEANFILES = Makefile.in
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in