Skip to content

Commit ccda28e

Browse files
committed
Rename 'src' folder to 'stackman'
This allows client libraries to avoid include ambiguities by adding an include path for the root, and then include the libraries using #include <stackman/stackman.h>
1 parent 958731e commit ccda28e

35 files changed

+59
-59
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22

3-
CPPFLAGS += -Isrc $(PLATFORMFLAGS)
3+
CPPFLAGS += -Istackman $(PLATFORMFLAGS)
44
CFLAGS += -fPIC -g $(PLATFORMFLAGS)
55
CXXFLAGS += -fPIC -g $(PLATFORMFLAGS)
66
LDFLAGS += -L$(LIB) -g $(PLATFORMFLAGS)
@@ -29,7 +29,7 @@ LIB := lib/$(ABI)
2929

3030
all: $(LIB)/libstackman.a
3131

32-
obj = src/stackman.o src/stackman_s.o
32+
obj = stackman/stackman.o stackman/stackman_s.o
3333

3434

3535
$(LIB)/libstackman.a: lib $(obj)
@@ -40,7 +40,7 @@ lib:
4040
mkdir -p $(LIB) bin
4141

4242
clean:
43-
rm -f src/*.o tests/*.o
43+
rm -f stackman/*.o tests/*.o
4444
rm -f bin/*
4545
rm -rf tmp
4646

abiname.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22

3-
# this script compiles and runs src/abiname.c which merely prints
3+
# this script compiles and runs stackman/abiname.c which merely prints
44
# out the name of the abi. This can be used by makefiles to identify
55
# the correct library path to use to link the library
66
# Instead of just compiling and running, we will use the provided compiler
@@ -16,7 +16,7 @@ tmp=$(mktemp "${here}/tmp/abinameXXX.c")
1616
#1 create the preprocessed file
1717
CC=${1:-cc}
1818
CFLAGS=${2:-}
19-
${CC} ${CFLAGS} -E -I "${here}/src" -o "${tmp}" "${here}/src/abiname.c"
19+
${CC} ${CFLAGS} -E -o "${tmp}" "${here}/stackman/abiname.c"
2020
#2 compile resulting file
2121
cc -o "${tmp}.out" "${tmp}"
2222
#3 run it
File renamed without changes.

0 commit comments

Comments
 (0)