[Openocd-svn] r1330 - branches/openocd-0.1/src/server tags/openocd-0.1.0/src/server

[<kc...@ma...>]

Author: kc8apf
Date: 2009-01-16 08:33:12 +0100 (Fri, 16 Jan 2009)
New Revision: 1330

Modified:
   branches/openocd-0.1/src/server/Makefile.am
   tags/openocd-0.1.0/src/server/Makefile.am
Log:
Merge distcheck fix into 0.1 branch and 0.1.0 tag

Modified: branches/openocd-0.1/src/server/Makefile.am
===================================================================
--- branches/openocd-0.1/src/server/Makefile.am	2009-01-16 07:31:55 UTC (rev 1329)
+++ branches/openocd-0.1/src/server/Makefile.am	2009-01-16 07:33:12 UTC (rev 1330)
@@ -14,8 +14,6 @@
 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)
+nobase_dist_pkglib_DATA = $(wildcard $(srcdir)/httpd/*.tcl $(srcdir)/httpd/*.css $(srcdir)/httpd/menu_cuts/*.png)
 endif
-AM_CPPFLAGS = -DPKGLIBDIR=\"$(pkglibdir)\" @CPPFLAGS@
\ No newline at end of file
+AM_CPPFLAGS = -DPKGLIBDIR=\"$(pkglibdir)\" @CPPFLAGS@

Modified: tags/openocd-0.1.0/src/server/Makefile.am
===================================================================
--- tags/openocd-0.1.0/src/server/Makefile.am	2009-01-16 07:31:55 UTC (rev 1329)
+++ tags/openocd-0.1.0/src/server/Makefile.am	2009-01-16 07:33:12 UTC (rev 1330)
@@ -14,8 +14,6 @@
 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)
+nobase_dist_pkglib_DATA = $(wildcard $(srcdir)/httpd/*.tcl $(srcdir)/httpd/*.css $(srcdir)/httpd/menu_cuts/*.png)
 endif
-AM_CPPFLAGS = -DPKGLIBDIR=\"$(pkglibdir)\" @CPPFLAGS@
\ No newline at end of file
+AM_CPPFLAGS = -DPKGLIBDIR=\"$(pkglibdir)\" @CPPFLAGS@