Merge branch 'devel' of newskysaw.cs.northwestern.edu:/home/palacios/palacios into...

[palacios.git] / symmods / capsule / Makefile

diff --git a/symmods/capsule/Makefile b/symmods/capsule/Makefile
index eaae927..a573104 100644 (file)
--- a/symmods/capsule/Makefile
+++ b/symmods/capsule/Makefile
@@ -1,9 +1,19 @@
 ifeq ($(MOD_TYPE),V3_LINUX_MOD)
-       MOD_IDX := 1
+       TYPE_IDX := 1
 else ifeq ($(MOD_TYPE),V3_SYM_MOD)
-       MOD_IDX := 2
-else ifeq($(MOD_TYPE),V3_SEC_MOD)
-       MOD_IDX := 3
+       TYPE_IDX := 2
+else ifeq ($(MOD_TYPE),V3_SEC_MOD)
+       TYPE_IDX := 3
+else 
+       TYPE_IDX := 0
+endif
+
+ifeq ($(MOD_ARCH),i386)
+       ARCH_IDX := 1
+else ifeq ($(MOD_ARCH),x86_64)
+       ARCH_IDX := 2
+else 
+       ARCH_IDX := 0
 endif
 
 
@@ -11,16 +21,18 @@ endif
 DEFS := -DMOD_NAME=$(MOD_NAME) \
        -DMOD_DIR=$(MOD_DIR) \
        -DMOD_OBJ=$(MOD_OBJ) \
-       -DMOD_TYPE=$(MOD_IDX)
+       -DMOD_TYPE=$(TYPE_IDX) \
+       -DMOD_ARCH=$(ARCH_IDX)
 
 
 #      cpp -undef $(DEFS) binary.S -o $(MOD_DIR)/.tmp.binary.S
 #      cpp $(DEFS) $(MOD_DIR)/.tmp.binary.S
 
+CFLAGS := -fno-stack-protector -Wall -O -Werror -fPIC -mno-red-zone
 
 module: FORCE
        cpp -undef $(DEFS) binary.S -o $(MOD_DIR)/.tmp.binary.S
-       gcc $(DEFS) -c $(MOD_DIR)/.tmp.binary.S -o $(MOD_DIR)/$(MOD_NAME).vo
+       gcc $(CFLAGS) $(DEFS) -c $(MOD_DIR)/.tmp.binary.S -o $(MOD_DIR)/$(MOD_NAME).vo
        rm -f $(MOD_DIR)/.tmp.binary.S
 
 FORCE: