Added missing spin-lock initialization and minor Makefiles update.

[lincan.git] / lincan / Makefile

diff --git a/lincan/Makefile b/lincan/Makefile
index 28722b9fcbe55aef5ecfd5ed033dff175238a621..d64354563d43ba4a44109f118b605d533e4119b0 100644 (file)
--- a/lincan/Makefile
+++ b/lincan/Makefile
@@ -1,3 +1,4 @@
+#
 # Makefile for the Linux CAN-bus driver.
 # Written by Arnaud Westenberg email:arnaud@wanadoo.nl
 # This software is released under the GPL-License.
@@ -8,16 +9,38 @@
 #
 ########## The following options can be changed ##########
 
-# Compiler
-CC = gcc
-# Enable debugging messages
-DEBUG = y 
+SUBDIRS = src utils
+
+ifndef SOURCES_DIR
+SOURCES_DIR := $(shell ( pwd -L ) )
+endif
+
+ifneq ($(wildcard $(SOURCES_DIR)/Standalone.mk),)
+# Standalone make outside of OCERA framework
 
 all: default
 
 .PHONY: dep default subdirs clean cleandepend
+.PHONY: check-dir include-pass library-pass binary-pass utils-pass kernel-lib-pass kernel-pass
 
 dirs = src utils
 
-default dep clean install:
-       $(foreach dir, $(dirs), $(MAKE) -C $(dir) $@ ; )
+default dep clean install utils-pass kernel-pass:
+       $(foreach dir, $(dirs), $(MAKE) -C $(SOURCES_DIR)/$(dir) \
+           SOURCES_DIR=$(SOURCES_DIR)/$(dir) $@ ; )
+
+else
+# Build in structure of OCERA framework
+
+TOPDIR = $(LINUX_DIR)
+
+ifneq ($(wildcard ../../../../ocera.mk),)
+include ../../../../ocera.mk
+else
+all: 
+       @echo -e "\nTo build LinCAN driver for OCERA framework, ocera.mk file have"
+       @echo -e "to be generated first. Go to ocera/ directory and do 'make', please."
+       @echo -e "If standalone build is required, mark lincan/ by 'touch ./Standalone.mk'.\n"
+endif
+endif
+