Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
add openocd.h for top-level declarations
[openocd.git] / src / server / Makefile.am
diff --git a/src/server/Makefile.am b/src/server/Makefile.am
index 2a723a6bdcc2db047b40c515ef6204e97ca4e726..6e52fdfb88f5a3d4fdb64968f84ac8959158b1a8 100644 (file)
--- a/src/server/Makefile.am
+++ b/src/server/Makefile.am
@@ -1,9 +1,10 @@
 AM_CPPFLAGS = \
 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  \
        -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
 
 METASOURCES = AUTO
 noinst_LTLIBRARIES = libserver.la
@@ -25,7 +26,12 @@ noinst_HEADERS += tcl_server.h
 libserver_la_SOURCES += tcl_server.c
 
 if HTTPD
 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 = \
 endif
 
 EXTRA_DIST = \
@@ -37,4 +43,4 @@ EXTRA_DIST = \
        httpd/Stylizer.java \
        httpd/Stylizer.class
 
        httpd/Stylizer.java \
        httpd/Stylizer.class
 
-MAINTAINERCLEANFILES = Makefile.in
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
Open On-Chip Debugger

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)