# HG changeset patch
# User dietmar.hahn@xxxxxxxxxxxxxxxxxxx
# Date 1171276084 -3600
# Node ID adbcaac2e98cd2348265d5f5faf9e8196ae82ca4
# Parent  ad9bbd103034cfd566e2801cfd8d51813f1b0f95
- Added ARCH_LDFLAGS for architecture specific LDFLAGS.
- Fixed build dependencies after changing makerule files.

Signed-off-by: Dietmar Hahn <dietmar.hahn@xxxxxxxxxxxxxxxxxxx>


diff -r ad9bbd103034 -r adbcaac2e98c extras/mini-os/Makefile
--- a/extras/mini-os/Makefile	Fri Feb 09 18:19:24 2007 +0000
+++ b/extras/mini-os/Makefile	Mon Feb 12 11:28:04 2007 +0100
@@ -44,10 +44,6 @@ ARCH_LINKS =
 # This can be overwritten from arch specific rules.
 EXTRA_INC =
 
-# Special build dependencies.
-# Build all after touching this/these file(s) (see minios.mk)
-SPEC_DEPENDS = minios.mk
-
 # Include the architecture family's special makerules.
 # This must be before include minios.mk!
 include $(TARGET_ARCH_DIR)/arch.mk
@@ -57,7 +53,6 @@ include minios.mk
 
 # Define some default flags for linking.
 LDLIBS := 
-LDFLAGS := 
 LDARCHLIB := -L$(TARGET_ARCH_DIR) -l$(ARCH_LIB_NAME)
 LDFLAGS_FINAL := -N -T $(TARGET_ARCH_DIR)/minios-$(TARGET_ARCH).lds
 
diff -r ad9bbd103034 -r adbcaac2e98c extras/mini-os/arch/x86/Makefile
--- a/extras/mini-os/arch/x86/Makefile	Fri Feb 09 18:19:24 2007 +0000
+++ b/extras/mini-os/arch/x86/Makefile	Mon Feb 12 11:28:04 2007 +0100
@@ -2,9 +2,6 @@
 # x86 architecture specific makefiles.
 # It's is used for x86_32, x86_32y and x86_64
 #
-
-# Rebuild all after touching this/these extra file(s) (see mini-os.mk)
-SPEC_DEP = arch.mk
 
 # include arch.mk has to be before mini-os.mk!
 include arch.mk
@@ -25,5 +22,5 @@ all: $(ARCH_LIB)
 	$(AR) rv $(ARCH_LIB) $(ARCH_OBJS)
 
 clean:
-	rm -f $(ARCH_LIB) $(ARCH_OBJS)
+	rm -f $(ARCH_LIB) $(ARCH_OBJS) $(HEAD_ARCH_OBJ)
 
diff -r ad9bbd103034 -r adbcaac2e98c extras/mini-os/arch/x86/arch.mk
--- a/extras/mini-os/arch/x86/arch.mk	Fri Feb 09 18:19:24 2007 +0000
+++ b/extras/mini-os/arch/x86/arch.mk	Mon Feb 12 11:28:04 2007 +0100
@@ -25,4 +25,3 @@ EXTRA_SRC += arch/$(EXTRA_INC)
 EXTRA_SRC += arch/$(EXTRA_INC)
 endif
 
-
diff -r ad9bbd103034 -r adbcaac2e98c extras/mini-os/minios.mk
--- a/extras/mini-os/minios.mk	Fri Feb 09 18:19:24 2007 +0000
+++ b/extras/mini-os/minios.mk	Mon Feb 12 11:28:04 2007 +0100
@@ -11,6 +11,7 @@ DEF_CFLAGS += -D__XEN_INTERFACE_VERSION_
 DEF_CFLAGS += -D__XEN_INTERFACE_VERSION__=$(XEN_INTERFACE_VERSION)
 
 DEF_ASFLAGS = -D__ASSEMBLY__
+DEF_LDFLAGS =
 
 ifeq ($(debug),y)
 DEF_CFLAGS += -g
@@ -23,9 +24,15 @@ endif
 # ARCH_... flags may be defined in arch/$(TARGET_ARCH_FAM/rules.mk
 CFLAGS := $(DEF_CFLAGS) $(ARCH_CFLAGS)
 ASFLAGS := $(DEF_ASFLAGS) $(ARCH_ASFLAGS)
+LDFLAGS := $(DEF_LDFLAGS) $(ARCH_LDFLAGS)
 
 # The path pointing to the architecture specific header files.
 ARCH_SPEC_INC := $(MINI-OS_ROOT)/include/$(TARGET_ARCH_FAM)
+
+# Special build dependencies.
+# Rebuild all after touching this/these file(s)
+SPEC_DEPENDS = $(MINI-OS_ROOT)/minios.mk \
+		$(MINI-OS_ROOT)/$(TARGET_ARCH_DIR)/arch.mk
 
 # Find all header files for checking dependencies.
 HDRS := $(wildcard $(MINI-OS_ROOT)/include/*.h)