| 1 |
--- a/Makefile
|
| 2 |
+++ b/Makefile
|
| 3 |
@@ -1,12 +1,4 @@
|
| 4 |
-INSTALLDIR = /
|
| 5 |
-
|
| 6 |
-CC=gcc
|
| 7 |
-
|
| 8 |
-CFLAGS=-Wall -O2 ${shell $(CC) -Wno-pointer-sign -S -o /dev/null -x c - < /dev/null > /dev/null 2>&1 && echo "-Wno-pointer-sign"}
|
| 9 |
-
|
| 10 |
-export CC
|
| 11 |
-export CFLAGS
|
| 12 |
-export INSTALLDIR
|
| 13 |
+CFLAGS += -Wall ${shell $(CC) -Wno-pointer-sign -S -o /dev/null -x c - < /dev/null > /dev/null 2>&1 && echo "-Wno-pointer-sign"}
|
| 14 |
|
| 15 |
all:
|
| 16 |
$(MAKE) -C sbin/ all
|
| 17 |
--- a/kernel_test/Makefile
|
| 18 |
+++ b/kernel_test/Makefile
|
| 19 |
@@ -3,20 +3,18 @@ ALL_FILES = tomoyo_filesystem_test tomoyo_file_test tomoyo_rewrite_test newns to
|
| 20 |
all: $(ALL_FILES)
|
| 21 |
chmod 755 testall.sh
|
| 22 |
|
| 23 |
-CC=gcc
|
| 24 |
-
|
| 25 |
-CFLAGS=-Wall -O2 ${shell $(CC) -Wno-pointer-sign -S -o /dev/null -x c - < /dev/null > /dev/null 2>&1 && echo "-Wno-pointer-sign"}
|
| 26 |
+CFLAGS += -Wall ${shell $(CC) -Wno-pointer-sign -S -o /dev/null -x c - < /dev/null > /dev/null 2>&1 && echo "-Wno-pointer-sign"}
|
| 27 |
|
| 28 |
#
|
| 29 |
# Tools for kernel testing.
|
| 30 |
#
|
| 31 |
|
| 32 |
tomoyo_new_test: tomoyo_new_test.c include.h
|
| 33 |
- $(CC) $(CFLAGS) -o tomoyo_new_test tomoyo_new_test.c -lutil
|
| 34 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o tomoyo_new_test tomoyo_new_test.c -lutil
|
| 35 |
chmod 700 tomoyo_new_test
|
| 36 |
|
| 37 |
.c: include.h
|
| 38 |
- $(CC) $(CFLAGS) -o $@ $<
|
| 39 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
|
| 40 |
chmod 700 $@
|
| 41 |
|
| 42 |
#
|
| 43 |
--- a/sbin/Makefile
|
| 44 |
+++ b/sbin/Makefile
|
| 45 |
@@ -9,7 +9,7 @@ install: all
|
| 46 |
cp -af --remove-destination $(BUILD_FILES) $(INSTALLDIR)/sbin/
|
| 47 |
|
| 48 |
.c:
|
| 49 |
- $(CC) $(CFLAGS) -o $@ $<
|
| 50 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
|
| 51 |
|
| 52 |
clean:
|
| 53 |
rm -f -- $(BUILD_FILES)
|
| 54 |
--- a/usr_lib_tomoyo/Makefile
|
| 55 |
+++ b/usr_lib_tomoyo/Makefile
|
| 56 |
@@ -9,7 +9,7 @@ install: all
|
| 57 |
cp -af --remove-destination $(BUILD_FILES) tomoyotools.conf ../README.tomoyo ../COPYING.tomoyo $(INSTALLDIR)/usr/lib/tomoyo/
|
| 58 |
|
| 59 |
.c:
|
| 60 |
- $(CC) $(CFLAGS) -o $@ $<
|
| 61 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
|
| 62 |
|
| 63 |
clean:
|
| 64 |
rm -f -- $(BUILD_FILES)
|
| 65 |
diff --git a/usr_sbin/Makefile b/usr_sbin/Makefile
|
| 66 |
index cdaf507..2b7c4f0 100644
|
| 67 |
--- a/usr_sbin/Makefile
|
| 68 |
+++ b/usr_sbin/Makefile
|
| 69 |
@@ -14,17 +14,17 @@ $(BUILD_FILES): libtomoyotools.so
|
| 70 |
sleep 10
|
| 71 |
|
| 72 |
libtomoyotools.so: tomoyotools.c tomoyotools.h
|
| 73 |
- $(CC) $(CFLAGS) -fPIC tomoyotools.c -shared -Wl,-soname,libtomoyotools.so.1 -o libtomoyotools.so.1.0.1
|
| 74 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIC tomoyotools.c -shared -Wl,-soname,libtomoyotools.so.1 -o libtomoyotools.so.1.0.1
|
| 75 |
ln -sf libtomoyotools.so.1.0.1 libtomoyotools.so
|
| 76 |
|
| 77 |
.c:
|
| 78 |
- $(CC) $(CFLAGS) -o $@ $< -ltomoyotools -L.
|
| 79 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -ltomoyotools -L.
|
| 80 |
|
| 81 |
tomoyo-editpolicy: tomoyotools.h editpolicy*.c readline.h /usr/include/curses.h libtomoyotools.so
|
| 82 |
- $(CC) $(CFLAGS) -o tomoyo-editpolicy editpolicy*.c -lncurses -ltomoyotools -L. -DCOLOR_ON
|
| 83 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o tomoyo-editpolicy editpolicy*.c -lncurses -ltomoyotools -L. -DCOLOR_ON
|
| 84 |
|
| 85 |
tomoyo-queryd: tomoyotools.h tomoyo-queryd.c readline.h /usr/include/curses.h libtomoyotools.so
|
| 86 |
- $(CC) $(CFLAGS) -o tomoyo-queryd tomoyo-queryd.c -lncurses -ltomoyotools -L.
|
| 87 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o tomoyo-queryd tomoyo-queryd.c -lncurses -ltomoyotools -L.
|
| 88 |
|
| 89 |
install: all
|
| 90 |
mkdir -p $(INSTALLDIR)/usr/sbin $(INSTALLDIR)/usr/lib
|
Parent Directory
| 
Revision Log