[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[bluetooth-dev] Makefile fixes



Hi
here's a patch against 3 makefiles:

1)exclude userstack from toplevel since it's already covered by the
Makefile in apps.It used to build twice creating a recursive symlink
in include/bluetooth
2)remove links in userstack in make clean
3)not all linuxes have /usr/linux pointing to where the kernel was built
since not all machines have kernel sources.I think the preffered way is
to use uname -r to find out where the currently running kernel was built

--- Makefile	27 Sep 2002 12:59:02 -0000	1.3
+++ Makefile	7 Mar 2003 13:54:00 -0000
@@ -8,7 +8,6 @@
 all:
 	make -C linux/drivers/char/bluetooth
 	make -C libs install
-	make -C apps/bluetooth/userstack links
 	make -C apps/bluetooth
 	make -C apps/bluetooth/sdp_server sdp_user
 
--- apps/bluetooth/userstack/Makefile	27 Sep 2002 12:59:03 -0000	1.28
+++ apps/bluetooth/userstack/Makefile	7 Mar 2003 13:54:13 -0000
@@ -78,7 +78,7 @@
 	$(INSTALL) -d $(INSTDIR)
 	$(INSTALL) -m $(INSTMODE) -o $(INSTOWNER) -g $(INSTGROUP) $(PROGS) $(INSTDIR)
 
-clean:
+clean: unlinks
 	rm -f $(PROGS) *.o *.d core *~
 
 links:
--- linux/drivers/char/bluetooth/Makefile	25 Apr 2002 14:56:21 -0000	1.32
+++ linux/drivers/char/bluetooth/Makefile	7 Mar 2003 13:54:14 -0000
@@ -67,7 +67,7 @@
 # The INCLUDEDIR variable allows LSB compliant distros to be able to compile
 # the module correctly. Use 'make INCLUDEDIR=/usr/src/linux/include' where
 # /usr/src/linux/include is the directory that was used to build the kernel.
-INCLUDEDIR = /usr/include
+INCLUDEDIR = /lib/modules/`uname -r`/build/include
 
 CC        = $(CROSSCOMPILE)gcc
 LD        = $(CROSSCOMPILE)ld
-
To unsubscribe from this list: send the line "unsubscribe bluetooth-dev" in
the body of a message to majordomo@xxxxxxx.com