Merge pull request #3 from PDXostc/reorg

Reorganize code and modify makefile
PDXostc · Aug 15, 2019 · f493aa6 · f493aa6
2 parents d305fdf + c6cd3b0
commit f493aa6
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -53,3 +53,5 @@ dkms.conf
 
 # Python 
 __pycache__/
+*_swig.py
+*.c
diff --git a/Makefile b/Makefile
@@ -1,14 +1,20 @@
 #
 # Makefile to generate python interface code for DSTC
 #
+.PHONY: all clean 
 
 CFLAGS += -ggdb
-DSTC_DIR ?= /usr/local/
-dstc_swig_wrap.o: dstc_swig_wrap.c
-	python3 setup.py build_ext --inplace  -I${DSTC_DIR}/include
+INC_DIRS ?= -I/usr/local/
 
-dstc_swig_wrap.c: dstc_swig.i
-	swig -I${DSTC_DIR}/include -python -includeall dstc_swig.i
+OBJ = ./src/dstc_swig_wrap.o
+SRC = ./src/dstc_swig_wrap.c
+SWIG = ./src/dstc_swig.i
+
+$(OBJ): $(SRC)
+	python3 setup.py build_ext --inplace $(INC_DIRS)
+
+$(SRC): $(SWIG)
+	swig $(INC_DIRS) -python -includeall $(SWIG)
 
 clean:
 	rm -rf _dstc*.so build dstc_swig.py dstc_swig_wrap.* __pycache__ \

diff --git a/callback_client.py → examples/callback_client.py b/callback_client.py → examples/callback_client.py
diff --git a/callback_server.py → examples/callback_server.py b/callback_server.py → examples/callback_server.py
diff --git a/complex_arg_client.py → examples/complex_arg_client.py b/complex_arg_client.py → examples/complex_arg_client.py
diff --git a/complex_arg_server.py → examples/complex_arg_server.py b/complex_arg_server.py → examples/complex_arg_server.py
diff --git a/dynamic_data_client.py → examples/dynamic_data_client.py b/dynamic_data_client.py → examples/dynamic_data_client.py
diff --git a/dynamic_data_server.py → examples/dynamic_data_server.py b/dynamic_data_server.py → examples/dynamic_data_server.py
diff --git a/print_name_and_age_client.py → examples/print_name_and_age_client.py b/print_name_and_age_client.py → examples/print_name_and_age_client.py
diff --git a/print_name_and_age_server.py → examples/print_name_and_age_server.py b/print_name_and_age_server.py → examples/print_name_and_age_server.py
diff --git a/setup.py b/setup.py
@@ -20,6 +20,6 @@
        description  = """SWIG wrapper for DSTC.""",
        py_modules   = [ 'dstc', 'dstc_swig' ],
        ext_modules  = [
-           Extension('_dstc_swig', sources=['dstc_swig_wrap.c',],libraries=['dstc', 'rmc'])
+           Extension('_dstc_swig', sources=['./src/dstc_swig_wrap.c',],libraries=['dstc', 'rmc'])
        ],
        )
diff --git a/dstc.py → src/dstc.py b/dstc.py → src/dstc.py
diff --git a/dstc_swig.i → src/dstc_swig.i b/dstc_swig.i → src/dstc_swig.i