fixed linux_module dependency tracking

[palacios.git] / Makefile

diff --git a/Makefile b/Makefile
index e21caf4..c2915a5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -181,9 +181,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
 
 HOSTCC         = gcc
 HOSTCXX        = g++
-HOSTCFLAGS     = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer \
+HOSTCFLAGS     = -Wall -Wstrict-prototypes  -fomit-frame-pointer \
                        -Wno-unused -Wno-format-security -U_FORTIFY_SOURCE
-HOSTCXXFLAGS   = -O2
+HOSTCXXFLAGS   = -O
 
 #      Decide whether to build built-in, modular, or both.
 #      Normally, just do built-in.
@@ -298,9 +298,14 @@ V3_INCLUDE      := -Ipalacios/include \
 
 CPPFLAGS        := $(V3_INCLUDE) -D__V3VEE__
 
-CFLAGS                 :=  -fno-stack-protector -Wall -O -Werror -fPIC -mno-red-zone
+CFLAGS                 :=  -fno-stack-protector -Wall -Werror  -mno-red-zone -fno-common 
 
-LDFLAGS         := --whole-archive
+
+
+#-ffreestanding
+
+
+LDFLAGS         := --whole-archive 
 
 ifeq ($(call cc-option-yn, -fgnu89-inline),y)
 CFLAGS         += -fgnu89-inline
@@ -429,6 +434,9 @@ scripts_basic: palacios/include/autoconf.h
 core-y          := palacios/src/palacios/
 libs-y         := palacios/lib/$(ARCH)/
 devices-y       := palacios/src/devices/
+modules-y       := modules/
+
+
 
 ifeq ($(dot-config),1)
 # In this section, we need .config
@@ -456,7 +464,12 @@ else
 palacios/include/autoconf.h: ;
 endif
 
+
+ifdef CONFIG_LINUX
+DEFAULT_EXTRA_TARGETS=linux_module
+else
 DEFAULT_EXTRA_TARGETS=
+endif
 
 # The all: target is the default when no target is given on the
 # command line.
@@ -465,6 +478,12 @@ DEFAULT_EXTRA_TARGETS=
 all: palacios $(DEFAULT_EXTRA_TARGETS)
 
 
+ifdef CONFIG_LINUX
+CFLAGS          += -mcmodel=kernel 
+else
+CFLAGS          += -fPIC
+endif
+
 ifdef CONFIG_FRAME_POINTER
 CFLAGS         += -fno-omit-frame-pointer $(call cc-option,-fno-optimize-sibling-calls,)
 else
@@ -478,6 +497,8 @@ endif
 
 ifdef CONFIG_DEBUG_INFO
 CFLAGS         += -g
+else 
+CFLAGS          += -O
 endif
 
 
@@ -507,7 +528,9 @@ export      INSTALL_PATH ?= /build
 
 
 palacios-dirs  := $(patsubst %/,%,$(filter %/,  \
-                    $(core-y) $(devices-y) $(libs-y)))
+                    $(core-y) $(devices-y) $(libs-y)) $(modules-y))
+
+
 
 #palacios-alldirs      := $(sort $(palacios-dirs) $(patsubst %/,%,$(filter %/, \
 #                   $(core-n) $(core-) $(devices-n) $(devices-) \
@@ -515,13 +538,16 @@ palacios-dirs     := $(patsubst %/,%,$(filter %/,  \
 
 
 palacios-cleandirs := $(sort $(palacios-dirs) $(patsubst %/,%,$(filter %/, \
-                       $(core-n) $(core-) $(devices-n) $(devices-))))
+                       $(core-n) $(core-) $(devices-n) $(devices-) $(modules-n) $(modules-))))
 
 
 
 core-y         := $(patsubst %/, %/built-in.o, $(core-y))
 devices-y      := $(patsubst %/, %/built-in.o, $(devices-y))
 libs-y         := $(patsubst %/, %/built-in.o, $(libs-y))
+modules-y       := $(patsubst %/, %/built-in.o, $(modules-y))
+#lnxmod-y        := $(patsubst %/, %/built-in.o, $(lnxmod-y))
+
 #core-y                := $(patsubst %/, %/lib.a, $(core-y))
 #devices-y     := $(patsubst %/, %/lib.a, $(devices-y))
 
@@ -544,9 +570,10 @@ libs-y             := $(patsubst %/, %/built-in.o, $(libs-y))
 
 
 
-palacios := $(core-y) $(devices-y) $(libs-y)
+palacios := $(core-y) $(devices-y) $(libs-y) $(modules-y)
+
 
-# Rule to link palacios - also used during CONFIG_KALLSYMS
+# Rule to link palacios - also used during CONFIG_CONFIGKALLSYMS
 # May be overridden by /Makefile.$(ARCH)
 quiet_cmd_palacios__ ?= AR $@ 
       cmd_palacios__ ?= $(AR) rcs $@ $^
@@ -585,6 +612,18 @@ libv3vee.a: $(palacios)
 
 palacios: libv3vee.a
 
+
+
+
+linux_module/v3vee.ko: linux_module/*.c
+       cd linux_module/ && make CONFIG_LINUX_KERN=$(CONFIG_LINUX_KERN)
+       cp linux_module/v3vee.ko v3vee.ko
+
+
+linux_module: linux_module/v3vee.ko 
+
+
+
 palacios.asm: palacios
        $(OBJDUMP) --disassemble $< > $@
 
@@ -680,6 +719,9 @@ MRPROPER_FILES += .config .config.old  .version .old_version \
                  tags TAGS cscope*
 
 
+#              \( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \
+
+
 # clean - Delete most, but leave enough to build external modules
 #
 clean: rm-dirs  := $(CLEAN_DIRS)
@@ -690,13 +732,14 @@ PHONY += $(clean-dirs) clean archclean
 $(clean-dirs):
        $(Q)$(MAKE) $(clean)=$(patsubst _clean_%,%,$@)
 
+
 clean: archclean $(clean-dirs)
        $(call cmd,rmdirs)
        $(call cmd,rmfiles)
        @find . $(RCS_FIND_IGNORE) \
                \( -name 'lib' \) -prune -o \
-               \( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \
-               -o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \) \
+               \( -name '*.[oas]' -o -name '.*.cmd' \
+               -o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' -o -name '*.ko' \) \
                -type f -print | xargs rm -f
 
 # mrproper - Delete all generated files, including .config
@@ -812,7 +855,7 @@ endif
 ALLSOURCE_ARCHS := $(ARCH)
 
 define all-sources
-       ( find $(__srctree)/palacios $(RCS_FIND_IGNORE) \
+       ( find $(__srctree)palacios $(RCS_FIND_IGNORE) \
               \( -name lib \) -prune -o \
               -name '*.[chS]' -print; )
 endef