Merge pull request #1 from kristjanvalur/dev

Dev

Author: kristjanvalur

.gitattributes

@@ -0,0 +1,6 @@
+# use unix lf line ending for everything except windows bat files
+* text=auto eol=lf
+*.asm text eol=lf
+*.h text eol=lf
+*.{cmd,[cC][mM][dD]} text eol=crlf
+*.{bat,[bB][aA][tT]} text eol=crlf

Makefile

@@ -1,6 +1,6 @@
 
 
-CPPFLAGS += -Isrc $(PLATFORMFLAGS)
+CPPFLAGS += -Istackman $(PLATFORMFLAGS)
 CFLAGS += -fPIC -g $(PLATFORMFLAGS)
 CXXFLAGS += -fPIC -g $(PLATFORMFLAGS)
 LDFLAGS += -L$(LIB) -g $(PLATFORMFLAGS)
@@ -29,7 +29,7 @@ LIB := lib/$(ABI)
 
 all: $(LIB)/libstackman.a
 
-obj = src/stackman.o src/stackman_s.o
+obj = stackman/stackman.o stackman/stackman_s.o
 
 
 $(LIB)/libstackman.a: lib $(obj)
@@ -40,7 +40,7 @@ lib:
 	mkdir -p $(LIB) bin
 
 clean:
-	rm -f src/*.o tests/*.o
+	rm -f stackman/*.o tests/*.o
 	rm -f bin/* 
 	rm -rf tmp
 

abiname.sh

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