Browse Source

move startup.c to libopenocd

Moves the creation of startup_tcl.c from src/helper/ to src/.
Prepares to split the startup.tcl file into its per-module parts.
tags/v0.4.0-rc1
Zachary T Welch 12 years ago
parent
commit
903daa796a
3 changed files with 25 additions and 10 deletions
  1. +1
    -0
      .gitignore
  2. +22
    -1
      src/Makefile.am
  3. +2
    -9
      src/helper/Makefile.am

+ 1
- 0
.gitignore View File

@@ -13,6 +13,7 @@
# editor files
*.swp

src/startup.tcl
startup_tcl.c
xscale_debug.h



+ 22
- 1
src/Makefile.am View File

@@ -14,7 +14,8 @@ openocd_LDADD = libopenocd.la

libopenocd_la_SOURCES = \
hello.c \
openocd.c
openocd.c \
startup_tcl.c

noinst_HEADERS = \
openocd.h
@@ -97,6 +98,26 @@ if HTTPD
libopenocd_la_LIBADD += -lmicrohttpd
endif

STARTUP_TCL_SRCS = \
$(srcdir)/helper/startup.tcl

EXTRA_DIST = $(STARTUP_TCL_SRCS)

BUILT_SOURCES = startup.tcl

startup.tcl: $(STARTUP_TCL_SRCS)
cat $^ > $@

BIN2C = $(builddir)/helper/bin2char$(EXEEXT_FOR_BUILD)

# Convert .tcl to cfile
startup_tcl.c: startup.tcl $(BIN2C)
$(BIN2C) startup_tcl < $< > $@ || rm -f $@

# add startup_tcl.c to make clean list
CLEANFILES = startup.tcl startup_tcl.c


MAINTAINERCLEANFILES = $(srcdir)/Makefile.in

# The "quick" target builds executables & reinstalls the executables


+ 2
- 9
src/helper/Makefile.am View File

@@ -23,8 +23,7 @@ libhelper_la_SOURCES = \
time_support.c \
replacements.c \
fileio.c \
membuf.c \
startup_tcl.c
membuf.c

if IOUTIL
libhelper_la_SOURCES += ioutil.c
@@ -49,7 +48,6 @@ noinst_HEADERS = \
jim.h \
jim-eventloop.h \
system.h \
startup.tcl \
bin2char.c

BIN2C = bin2char$(EXEEXT_FOR_BUILD)
@@ -59,11 +57,6 @@ BUILT_SOURCES = $(BIN2C)
$(BIN2C): bin2char.c
${CC_FOR_BUILD} ${CFLAGS_FOR_BUILD} $(srcdir)/bin2char.c -o $@

# Convert .tcl to cfile
startup_tcl.c: startup.tcl $(BIN2C)
./$(BIN2C) startup_tcl < $(srcdir)/startup.tcl > $@

# add startup_tcl.c to make clean list
CLEANFILES = startup_tcl.c bin2char$(EXEEXT_FOR_BUILD)
CLEANFILES = bin2char$(EXEEXT_FOR_BUILD)

MAINTAINERCLEANFILES = $(srcdir)/Makefile.in

Loading…
Cancel
Save