Cleaning up source area, ready for debianizing, and rpm after that.

git-svn-id: svn://svn.autonomy.net.au/python-dmidecode@108 abc39116-655e-4be6-ad55-d661dc543056

16 files changed, 18 insertions, 5 deletions

diff --git a/Makefile b/Makefile
index 2465526..6da92fc 100644
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,8 @@
 PY     := $(shell python -V 2>&1 |sed -e 's/.\(ython\) \(2\.[0-9]\)\..*/p\1\2/')
 CC     := gcc
 RM     := rm -f
+SRC_D  := src
+OBJ_D  := lib
 CFLAGS  = -g -D_XOPEN_SOURCE=600
 CFLAGS += -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-align
 CFLAGS += -Wwrite-strings -Wmissing-prototypes -Winline -Wundef #-Wcast-qual
@@ -23,13 +25,18 @@ LDFLAGS =
 SOFLAGS = -pthread -shared -L/home/nima/dev-room/projects/dmidecode -lutil
 SO      = /usr/lib/$(PY)/site-packages/dmidecode.so
 
+#. Search
+vpath %.o $(OBJ_D)
+vpath %.c $(SRC_D)
+vpath %.h $(SRC_D)
+vpath % $(OBJ_D)
 
 ###############################################################################
 install: build
-	$(PY) setup.py install
+	$(PY) src/setup.py install
 
 build:
-	$(PY) setup.py build
+	$(PY) src/setup.py build
 
 
 ###############################################################################
@@ -62,8 +69,8 @@ uninstall:
 	rm -f $(SO)
 
 clean :
-	$(PY) setup.py clean
-	-$(RM) *.so *.o core
+	$(PY) src/setup.py clean
+	-$(RM) lib/*.so lib/*.o core
 	-rm -rf build
 
 .PHONY: install clean uninstall module
diff --git a/example.py b/doc/example.py
index a6c7bf7..a6c7bf7 100755
--- a/example.py
+++ b/doc/example.py
diff --git a/config.h b/src/config.h
index c1d7d03..c1d7d03 100644
--- a/config.h
+++ b/src/config.h
diff --git a/dmidecode.c b/src/dmidecode.c
index 31129be..31129be 100644
--- a/dmidecode.c
+++ b/src/dmidecode.c
diff --git a/dmidecode.h b/src/dmidecode.h
index 46f822f..46f822f 100644
--- a/dmidecode.h
+++ b/src/dmidecode.h
diff --git a/dmidecodemodule.c b/src/dmidecodemodule.c
index 5ede36e..5ede36e 100644
--- a/dmidecodemodule.c
+++ b/src/dmidecodemodule.c
diff --git a/dmidecodemodule.h b/src/dmidecodemodule.h
index 02131c6..02131c6 100644
--- a/dmidecodemodule.h
+++ b/src/dmidecodemodule.h
diff --git a/dmihelper.c b/src/dmihelper.c
index 6d52e04..6d52e04 100644
--- a/dmihelper.c
+++ b/src/dmihelper.c
diff --git a/dmihelper.h b/src/dmihelper.h
index 63415fe..63415fe 100644
--- a/dmihelper.h
+++ b/src/dmihelper.h
diff --git a/dmioem.c b/src/dmioem.c
index a2fd2a2..a2fd2a2 100644
--- a/dmioem.c
+++ b/src/dmioem.c
diff --git a/dmioem.h b/src/dmioem.h
index 00483f2..00483f2 100644
--- a/dmioem.h
+++ b/src/dmioem.h
diff --git a/setup.py b/src/setup.py
index 2dd961e..22abfaf 100644
--- a/setup.py
+++ b/src/setup.py
@@ -10,7 +10,13 @@ setup(
   ext_modules = [
     Extension(
       "dmidecode",
-      sources      = [ "dmidecodemodule.c", "dmihelper.c", "util.c", "dmioem.c", "dmidecode.c" ],
+      sources      = [
+        "src/dmidecodemodule.c",
+        "src/dmihelper.c",
+        "src/util.c",
+        "src/dmioem.c",
+        "src/dmidecode.c"
+      ],
       library_dirs = [ "/home/nima/dev-room/projects/dmidecode" ],
       libraries    = [ "util" ],
       #libraries    = [ "util", "efence" ],
diff --git a/types.h b/src/types.h
index b124ecf..b124ecf 100644
--- a/types.h
+++ b/src/types.h
diff --git a/util.c b/src/util.c
index 15d24a7..15d24a7 100644
--- a/util.c
+++ b/src/util.c
diff --git a/util.h b/src/util.h
index 894bd2f..894bd2f 100644
--- a/util.h
+++ b/src/util.h
diff --git a/version.h b/src/version.h
index 050cf7a..050cf7a 100644
--- a/version.h
+++ b/src/version.h