Move files in src to src/linux.

kubo · Jun 17, 2018 · 470d37c · 470d37c
1 parent 3af6b81
commit 470d37c
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 30 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,8 @@
 *~
 *.o
 /cmd/injector
-/src/libinjector.a
-/src/libinjector.so
+/src/linux/libinjector.a
+/src/linux/libinjector.so
 /tests/test-library.so
 /tests/test-library-*.so
 /tests/test-prog

diff --git a/Makefile b/Makefile
@@ -1,11 +1,11 @@
 all:
-	cd src && make
+	cd src/linux && make
 	cd cmd && make
 
 check:
 	cd tests && make check
 
 clean:
-	cd src && make clean
+	cd src/linux && make clean
 	cd cmd && make clean
 	cd tests && make clean
diff --git a/cmd/Makefile b/cmd/Makefile
@@ -2,13 +2,13 @@ CFLAGS = -Wall -I../include
 
 all: injector
 
-injector: main.o ../src/libinjector.a
-	$(CC) -o injector main.o ../src/libinjector.a
+injector: main.o ../src/linux/libinjector.a
+	$(CC) -o injector main.o ../src/linux/libinjector.a
 
 main.o: main.c
 
-../src/libinjlib.a:
-	cd ../src && make
+../src/linux/libinjlib.a:
+	cd ../src/linux && make
 
 clean:
 	$(RM) injector main.o
diff --git a/src/Makefile b/src/Makefile
diff --git a/src/linux/Makefile b/src/linux/Makefile
@@ -0,0 +1,19 @@
+INJECTOR_OBJS = elf.o injector.o ptrace.o remote_call.o util.o
+CFLAGS = -Wall -fPIC -I../../include
+
+all: libinjector.so libinjector.a
+
+libinjector.so: $(INJECTOR_OBJS)
+	$(CC) -shared -o libinjector.so $(INJECTOR_OBJS)
+
+libinjector.a: $(INJECTOR_OBJS)
+	$(AR) rcs libinjector.a $(INJECTOR_OBJS)
+
+elf.o: elf.c injector_internal.h ../../include/injector.h
+injector.o: injector.c injector_internal.h ../../include/injector.h
+ptrace.o: ptrace.c injector_internal.h ../../include/injector.h
+remote_call.o: remote_call.c injector_internal.h ../../include/injector.h
+util.o: util.c injector_internal.h ../../include/injector.h
+
+clean:
+	$(RM) libinjector.so libinjector.a $(INJECTOR_OBJS)
diff --git a/src/elf.c → src/linux/elf.c b/src/elf.c → src/linux/elf.c
diff --git a/src/injector.c → src/linux/injector.c b/src/injector.c → src/linux/injector.c
diff --git a/src/injector_internal.h → src/linux/injector_internal.h b/src/injector_internal.h → src/linux/injector_internal.h
@@ -31,7 +31,7 @@
 #include <sys/user.h>
 #include <sys/ptrace.h>
 #include <errno.h>
-#include "../include/injector.h"
+#include "injector.h"
 
 #ifdef __LP64__
 #define SIZE_T_FMT "l"

diff --git a/src/ptrace.c → src/linux/ptrace.c b/src/ptrace.c → src/linux/ptrace.c
diff --git a/src/remote_call.c → src/linux/remote_call.c b/src/remote_call.c → src/linux/remote_call.c
diff --git a/src/util.c → src/linux/util.c b/src/util.c → src/linux/util.c
diff --git a/tests/Makefile b/tests/Makefile
@@ -78,8 +78,8 @@ armel:
 build: test-prog$(SUFFIX) test-target$(SUFFIX) test-library$(SUFFIX).so
 
 test-prog$(SUFFIX): test-prog.c
-	cd ../src && make clean && make
-	$(LINK_PROG) -o $@ $^ ../src/libinjector.a
+	cd ../src/linux && make clean && make
+	$(LINK_PROG) -o $@ $^ ../src/linux/libinjector.a
 
 test-target$(SUFFIX): test-target.c
 	$(LINK_TARGET) -o $@ $^