Changes to Makefile.rules to be more cross-compile friendly.

Changed hard-coded "ar" to AR and KERN_AR variables.
Correctness checked on arm-linux target.

diff --git a/Makefile.rules b/Makefile.rules
index 39dbfaab878c1992f7c664cd36d59df371c751f4..3c2cda081d0b5d181ec7b7e41fccbb0b79798a7a 100644 (file)
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -111,9 +111,11 @@ endif
 export SOURCES_DIR MAKERULES_DIR RELATIVE_DIR LINUX_DIR LINUX_VERSION RTL_DIR
 export CONFIG_FILE OMK_SERIALIZE_INCLUDED
 
-CFLAGS += -ggdb
+#CFLAGS += -ggdb
 CFLAGS += -O2 
 CFLAGS += -Wall
+#CXXFLAGS += -ggdb
+CXXFLAGS += -O2 
 CXXFLAGS += -Wall
 
 
@@ -280,8 +282,8 @@ USER_OBJS  += $$($(1)_OBJS)
 USER_SOURCES += $$($(1)_SOURCES)
 
 $(USER_LIB_DIR)/lib$(1).a: $$($(1)_OBJS)
-       ar rcs $$@ $$^
-       ranlib $$@
+       $(AR) rcs $$@ $$^
+       #ranlib $$@
 endef
 
 
@@ -322,6 +324,7 @@ cc_o_kern_COMPILE = $(CXX) $(INCLUDES) $(CXXFLAGS) -DOMK_FOR_KERNEL -DEXPORT_SYM
 KERN_EXE_SUFFIX := .o
 KERN_ARCH = $(ARCH)
 KERN_LD = $(LD)
+KERN_AR = $(AR)
 
 else # CONFIG_RTLINUX
 
@@ -349,6 +352,11 @@ KERN_LD = $(LINUX_LD)
 else
 KERN_LD = echo KERN_LD  not defined - skipped
 endif
+ifneq ($(LINUX_AR),)
+KERN_AR = $(LINUX_AR)
+else
+KERN_AR = $(AR)
+endif
 endif # CONFIG_RTLINUX
 
 KERN_LOADLIBES += -L$(KERN_LIB_DIR) 
@@ -461,8 +469,8 @@ KERN_OBJS  += $$($(1)_OBJS)
 KERN_SOURCES += $$($(1)_SOURCES)
 
 $(KERN_LIB_DIR)/lib$(1).a: $$($(1)_OBJS)
-       ar rcs $$@ $$^
-       ranlib $$@
+       $(KERN_AR) rcs $$@ $$^
+       #ranlib $$@
 endef
 
 

diff --git a/kernelcfg2mk b/kernelcfg2mk
index da834218f5cf6f0fe82685cfcbe626504b332b55..071932ba2185de7527b665a9298a4a0b3ddbfb4a 100755 (executable)
--- a/kernelcfg2mk
+++ b/kernelcfg2mk
@@ -86,6 +86,7 @@ modules:
        echo LINUX_CC="\$(CC)" >>flags
        echo LINUX_LD="\$(LD) \$(LDFLAGS)" >>flags
        echo LINUX_AS="\$(AS)" >>flags
+       echo LINUX_AR="\$(AR)" >>flags
        echo LINUX_MODULE_EXT=".o" >>flags
 
 EOF
@@ -135,6 +136,7 @@ flags:
        echo LINUX_CC="\$(CC)" >>\$(obj)/flags
        echo LINUX_LD="\$(LD) \$(LDFLAGS) \$(LDFLAGS_MODULE)" >>\$(obj)/flags
        echo LINUX_AS="\$(AS)" >>\$(obj)/flags
+       echo LINUX_AR="\$(AR)" >>\$(obj)/flags
        echo LINUX_MODULE_EXT=".ko" >>\$(obj)/flags
 EOF
 

diff --git a/switch2standalone b/switch2standalone
new file mode 100755 (executable)
index 0000000..4996496
--- /dev/null
+++ b/switch2standalone
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# Script to modify Makefile.rules for standalone build
+# without OCERA framework
+
+if [ ! -e Makefile.rules-ocera ] ; then
+  mv Makefile.rules Makefile.rules-ocera
+fi
+
+# Commentout definition of OCERA location
+sed -e 's/^OCERA_DIR := /#OCERA_DIR := /' <Makefile.rules-ocera >Makefile.rules
+
+# Prepare "config.omk-default" file, user overrides should go into "config.omk"
+make default-config
+
+echo 
+echo 'To modify required configuration options, create "config.omk" file'
+echo 'and add modified lines from "config.omk-default" file into it'
+echo 
+echo 'To build project, call simple "make"'
+echo
+echo 'GNU make program version 3.81beta1 or newer is required to build project'
+echo 'check by "make --version" command' 
+echo