X-Git-Url: http://git.maemo.org/git/?p=cilux;a=blobdiff_plain;f=makefile;h=271ab7faf3c49e64ae3711f41f144647ff0a3aba;hp=95ec4e2a04ab6cbf073fbe04492060a6737de37a;hb=HEAD;hpb=99340c43f64ab2633f2f0203f4ce6609fdc5ee82

diff --git a/makefile b/makefile
index 95ec4e2..271ab7f 100644
--- a/makefile
+++ b/makefile
@@ -15,11 +15,11 @@ linux: CCOPTIONS=-g -O -Wall -Wimplicit
 linux: COMPILEOPTIONS=-march=i386 -mtune=i586 -fPIC
 linux: LINKOPTIONS=-Wl,-export-dynamic -Wl,-rpath,.
 linux: LINKOPTIONS=-Wl,-export-dynamic
-linux: INCLUDES=-I/usr/local/include -I../include -I../../include -I.. -I../platform/linux -I../../platform/linux
+linux: INCLUDES=-I/usr/local/include -I. -I../include -I../../include -I../../../include -I.. -I../platform/linux -I../../platform/linux -I../../../platform/linux
 linux: LIBRARIES=-L/usr/local/lib -lnsl -ldl -lm -lX11 -lEGL -lGLESv2
 linux: linux-all
 
-linux-all: cilux mod-ni.so mod-np.so mod-mid.so install-lin
+linux-all: cilux mod-on.so mod-op.so mod-mid.so mod-teston.so install-lin
 
 # ---------------------------------------------------------------------------- #
 
@@ -31,47 +31,55 @@ version-lin:
 	@echo -n " Linux (Built "                      >> src/platform/linux/version.h
 	@date | tr '\012' ')'                          >> src/platform/linux/version.h
 	@echo "\";"                                    >> src/platform/linux/version.h
-	@echo "static char* cilux_ciux=\"np\";"        >> src/platform/linux/version.h
+	@echo "static char* cilux_ciux=\"op\";"        >> src/platform/linux/version.h
 
-cilux: version-lin src/platform/linux/cilux.c src/platform/linux/osapi.c src/platform/kernelapi.c src/include/kernelapi.h src/platform/linux/platform.h
+cilux: version-lin src/platform/linux/cilux.c src/platform/linux/kernelplat.h src/platform/linux/kernelplat.c src/platform/kernelapi.c src/include/kernelapi.h src/platform/linux/platform.h
 	(cd src/platform/linux; $(CC) $(CCOPTIONS) -c cilux.c -o cilux.o $(COMPILEOPTIONS) $(INCLUDES))
 	(cd src/platform;       $(CC) $(CCOPTIONS) -c kernelapi.c -o kernelapi.o $(COMPILEOPTIONS) $(INCLUDES))
 	(cd src/platform/linux; $(CC) $(CCOPTIONS) -o ../../../cilux cilux.o ../kernelapi.o $(LINKOPTIONS) $(LIBRARIES))
 	$(STRIP) cilux
 	@echo '--------------------'
 
-mod-ni.so: src/ni/ni.c src/ni/headers.c src/include/ni.h src/include/kernelapi.h src/platform/linux/platform.h
-	(cd src/ni; $(CC) $(CCOPTIONS) -c headers.c -o headers.o $(COMPILEOPTIONS) $(INCLUDES))
-	(cd src/ni; $(CC) $(CCOPTIONS) -c ni.c     -o ni.o     $(COMPILEOPTIONS) $(INCLUDES))
-	$(CCLIB),mod-ni.so -o mod-ni.so src/ni/headers.o src/ni/ni.o
-	$(STRIP) mod-ni.so
+mod-on.so: src/on/notification.c src/on/headers.c src/include/notification.h src/include/kernelapi.h src/platform/linux/platform.h
+	(cd src/on; $(CC) $(CCOPTIONS) -c headers.c       -o headers.o      $(COMPILEOPTIONS) $(INCLUDES))
+	(cd src/on; $(CC) $(CCOPTIONS) -c notification.c  -o notification.o $(COMPILEOPTIONS) $(INCLUDES))
+	$(CCLIB),mod-on.so -o mod-on.so src/on/headers.o src/on/notification.o
+	$(STRIP) mod-on.so
 	@echo '--------------------'
 
-mod-np.so: src/drivers/np/np.c src/drivers/np/uri2chan.c src/include/kernelapi.h src/platform/linux/platform.h
-	(cd src/drivers/np; $(CC) $(CCOPTIONS) -c np.c      -o np.o   $(COMPILEOPTIONS) $(INCLUDES))
-	(cd src/drivers/np; $(CC) $(CCOPTIONS) -c uri2chan.c -o uri2chan.o $(COMPILEOPTIONS) $(INCLUDES))
-	(cd src/drivers/np; $(CC) $(CCOPTIONS) -c cache.c    -o cache.o $(COMPILEOPTIONS) $(INCLUDES))
-	$(CCLIB),mod-np.so -o mod-np.so src/drivers/np/np.o src/drivers/np/uri2chan.o src/drivers/np/cache.o
-	$(STRIP) mod-np.so
+mod-op.so: src/drivers/op/protocol.c src/drivers/op/uri2chan.c src/include/kernelapi.h src/platform/linux/platform.h
+	(cd src/drivers/op; $(CC) $(CCOPTIONS) -c protocol.c -o protocol.o   $(COMPILEOPTIONS) $(INCLUDES))
+	(cd src/drivers/op; $(CC) $(CCOPTIONS) -c uri2chan.c -o uri2chan.o $(COMPILEOPTIONS) $(INCLUDES))
+	(cd src/drivers/op; $(CC) $(CCOPTIONS) -c cache.c    -o cache.o $(COMPILEOPTIONS) $(INCLUDES))
+	$(CCLIB),mod-op.so -o mod-op.so src/drivers/op/protocol.o src/drivers/op/uri2chan.o src/drivers/op/cache.o
+	$(STRIP) mod-op.so
 	@echo '--------------------'
 
-mod-mid.so: src/drivers/mid/mid.c src/include/kernelapi.h src/platform/linux/platform.h
-	(cd src/drivers/mid; $(CC) $(CCOPTIONS) -c mid.c -o mid.o $(COMPILEOPTIONS) $(INCLUDES))
-	$(CCLIB),mod-mid.so -o mod-mid.so src/drivers/mid/mid.o
+mod-mid.so: src/drivers/ot/mid/mid.c src/include/kernelapi.h src/platform/linux/platform.h
+	(cd src/drivers/ot/mid; $(CC) $(CCOPTIONS) -c mid.c -o mid.o $(COMPILEOPTIONS) $(INCLUDES))
+	$(CCLIB),mod-mid.so -o mod-mid.so src/drivers/ot/mid/mid.o
 	$(STRIP) mod-mid.so
 	@echo '--------------------'
 
+mod-teston.so: src/drivers/ot/test/teston.c src/include/kernelapi.h src/platform/linux/platform.h
+	(cd src/drivers/ot/test; $(CC) $(CCOPTIONS) -c teston.c -o teston.o $(COMPILEOPTIONS) $(INCLUDES))
+	$(CCLIB),mod-teston.so -o mod-teston.so src/drivers/ot/test/teston.o
+	$(STRIP) mod-teston.so
+	@echo '--------------------'
+
 install-lin:
-	cp cilux /usr/local/bin
-	cp mod-ni.so mod-np.so /usr/local/lib
-	cp mod-mid.so modules/mid
+	mv cilux /usr/local/bin
+	mv mod-on.so mod-op.so /usr/local/lib
+	mkdir -p modules/mid
+	mv mod-mid.so modules/mid
+	mkdir -p modules/teston
+	mv mod-teston.so modules/teston
 	@echo '--------------------'
 
 # ---------------------------------------------------------------------------- #
 
 clean:
 	find . -name '*.o'   | xargs rm -f
-	find . -name '*.log' | xargs rm -f
 	rm -f cilux *.so
 	rm -f ,*
 	rm -f modules/*/mod-*.*