svec: miscellaneous fixes in makefiles

4faca0bb · Juan David González Cobas · 49ef964a · 4faca0bb · 4faca0bb
Commit 4faca0bb authored May 07, 2013 by Juan David González Cobas
Hide whitespace changes
Inline Side-by-side

Showing with 18 additions and 6 deletions

Makefile kernel/Makefile +6 -1

Makefile tools/Makefile +12 -5

No files found.
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -25,5 +25,10 @@ all: modules

 .PHONY: all modules clean help install modules_install

-modules clean help install modules_install:
+modules help install modules_install:
 	$(MAKE) -C $(LINUX) M=$(shell pwd) CPU=$(CPU) KVER=$(KVER) $@
+
+# be able to run the "clean" rule even if $(LINUX) is not valid
+clean:
+	rm -rf *.o *~  .*.cmd *.ko *.mod.c .tmp_versions Module.symvers \
+                         Module.markers modules.order
--- a/tools/Makefile
+++ b/tools/Makefile
+ENV ?= lab
+CPU ?= L865

-VME_INC ?= /acc/src/dsc/drivers/coht/vmebridge/include/ 
+include /acc/src/dsc/co/Make.auto
+
+VME_INC ?= /acc/src/dsc/drivers/coht/vmebridge/include/

 CFLAGS += -g -Wall
 CFLAGS += -I $(VME_INC)
-LDFLAGS += -L /acc/local/L865/lib 
+LDFLAGS += -L /acc/local/$(CPU)/lib
 LDLIBS += -lvmebus

-all: vme
-vme: vme.o
+all: vme.$(CPU)
+vme.$(CPU): vme.$(CPU).o
+
+install-$(ENV):
+	dsc_install vme.$(CPU) /acc/dsc/$(ENV)/$(CPU)/bin

 clean:
-	rm -f *.o vme
+	rm -f *.o *.$(CPU)

 # These targets are called from ../Makefile, just do nothing
 modules install modules_install: