From 86211b8505f69824c55ab3fe2518d5adad7056b2 Mon Sep 17 00:00:00 2001
From: "J.A. de Jong" <j.a.dejong@ascee.nl>
Date: Sat, 5 Jan 2019 12:16:03 +0100
Subject: [PATCH] Updated setup.py, gitignore, cmakelists

---
 .gitignore     |  1 +
 CMakeLists.txt |  8 +++++++-
 setup.py       | 16 ++++++++++------
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0553215..47b34d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 *.a
 *.pyc
+dist
 CMakeFiles
 CMakeCache.txt
 cmake_install.cmake
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 256cd59..aa71987 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -112,7 +112,13 @@ add_subdirectory(test)
 
 # set(SETUP_PY_IN "${CMAKE_CURRENT_SOURCE_DIR}/setup.py.in")
 set(SETUP_PY    "${CMAKE_CURRENT_BINARY_DIR}/setup.py")
-set(DEPS        "${CMAKE_CURRENT_SOURCE_DIR}/lasp/*.py")
+
+set(DEPS  "${CMAKE_CURRENT_SOURCE_DIR}/*.py"
+          "${CMAKE_CURRENT_SOURCE_DIR}/lasp/*.py"
+          "wrappers"
+          "lasp_daqdevice")
+
+             # )
 set(OUTPUT      "${CMAKE_CURRENT_BINARY_DIR}/build/timestamp")
 
 # configure_file(${SETUP_PY_IN} ${SETUP_PY})
diff --git a/setup.py b/setup.py
index 13245c1..d780664 100644
--- a/setup.py
+++ b/setup.py
@@ -3,21 +3,25 @@
 """
 @author: J.A. de Jong - ASCEE
 """
-from setuptools import setup
+from setuptools import setup, find_packages
 
-descr = """Library for Acoustic Signal Processing. This Python module contains
-tools and code for common operations on acoustic signals."""
 
 setup(
       name="LASP",
       version="1.0",
-      packages=['lasp'],
+      packages=find_packages(),
+      long_description=open("./README.md", 'r').read(),
+      long_description_content_type="text/markdown",
+      # ext_modules=[CMakeExtension('lasp/wrappers.so'),
+      #              ],
+      package_data={'lasp': ['wrappers.so']},
       author='J.A. de Jong - ASCEE',
       author_email="j.a.dejong@ascee.nl",
       install_requires=['matplotlib>=1.0',
-                        'scipy>=1.0', 'numpy>=1.0', 'h5py'],
+                        'scipy>=1.0', 'numpy>=1.0', 'h5py',
+                        'lrftubes>=1.0'],
       license='MIT',
-      description=descr,
+      description="Library for Acoustic Signal Processing",
       keywords="",
       url="https://www.ascee.nl/lasp/",   # project home page, if any