11 files changed, 74 insertions, 75 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e44343d..17d3fc4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.8.11)
 
 if (NOT DEFINED CMAKE_BUILD_TYPE)
   set (CMAKE_BUILD_TYPE Release CACHE STRING "Build type")
@@ -9,65 +9,8 @@ project (dlfcn-win32 C)
 option(BUILD_SHARED_LIBS "shared/static libs" ON) 
 option(BUILD_TESTS "tests?" OFF)
 
-set(headers dlfcn.h)
-set(sources dlfcn.c)
-
-if (BUILD_SHARED_LIBS)
-  add_definitions(-DSHARED)
-endif (BUILD_SHARED_LIBS)
-
-add_library(dl ${sources})
-
-install (TARGETS dl EXPORT dlfcn-win32-targets
-                    RUNTIME DESTINATION bin
-                    LIBRARY DESTINATION lib${LIB_SUFFIX}
-                    ARCHIVE DESTINATION lib${LIB_SUFFIX})
-
-install (FILES ${headers} DESTINATION include)
-
-# If CMake version is greater than or equal to 2.8.11
-# also install the cmake configuration files to simplify
-# the use of dlfcn-win32 in CMake
-if(NOT ${CMAKE_VERSION} VERSION_LESS "2.8.11")
-    # Correctly export the location of installed includes in the target 
-    target_include_directories(dl INTERFACE $<INSTALL_INTERFACE:include>)
-
-    # Export the targets  (build tree)
-    export(EXPORT dlfcn-win32-targets
-           FILE "${CMAKE_CURRENT_BINARY_DIR}/dlfcn-win32-targets.cmake"
-           NAMESPACE dlfcn-win32::
-    )
-    
-    # Write the CMake config file
-    set(CMAKE_CONF_INSTALL_DIR share/dlfcn-win32)
-    set(INCLUDE_INSTALL_DIR include)
-    include(CMakePackageConfigHelpers)
-    configure_package_config_file(dlfcn-win32-config.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/dlfcn-win32-config.cmake
-                                  INSTALL_DESTINATION ${CMAKE_CONF_INSTALL_DIR}
-                                  PATH_VARS INCLUDE_INSTALL_DIR
-                                  NO_CHECK_REQUIRED_COMPONENTS_MACRO)
-
-    # Install the targets (install)
-    install(EXPORT dlfcn-win32-targets
-            FILE dlfcn-win32-targets.cmake
-            NAMESPACE dlfcn-win32::
-            DESTINATION ${CMAKE_CONF_INSTALL_DIR})
-
-    # Install the CMake config file
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/dlfcn-win32-config.cmake
-            DESTINATION ${CMAKE_CONF_INSTALL_DIR})
-endif()
+add_subdirectory(src)
 
 if (BUILD_TESTS)
-  enable_testing()
-  add_library(testdll SHARED testdll.c)
-  set_target_properties(testdll PROPERTIES PREFIX "")
-  add_library(testdll2 SHARED testdll2.c)
-  set_target_properties(testdll2 PROPERTIES PREFIX "")
-  target_link_libraries(testdll2 dl)
-  add_library(testdll3 SHARED testdll3.c)
-  set_target_properties(testdll3 PROPERTIES PREFIX "")
-  add_executable(t_dlfcn test.c)
-  target_link_libraries(t_dlfcn dl)
-  add_test (NAME t_dlfcn COMMAND t_dlfcn)
-endif ()
+  add_subdirectory(tests)
+endif()
diff --git a/Makefile b/Makefile
index 89c5d68..ab7279b 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 # dlfcn-win32 Makefile

 #

 include config.mak

-CFLAGS = -Wall -O3 -fomit-frame-pointer

+CFLAGS = -Wall -O3 -fomit-frame-pointer -Isrc

 

 ifeq ($(BUILD_SHARED),yes)

         TARGETS += libdl.dll

@@ -21,13 +21,13 @@ ifeq ($(BUILD_MSVC),yes)
         INSTALL += lib-install

 endif

 

-SOURCES  := dlfcn.c

-HEADERS  := dlfcn.h

+SOURCES  := src/dlfcn.c

+HEADERS  := src/dlfcn.h

 

 all: $(TARGETS)

 

 libdl.a: $(SOURCES)

-        $(CC) $(CFLAGS) -c $^

+        $(CC) $(CFLAGS) -o $(^:%.c=%.o) -c $^

         $(AR) cru $@ $(SOURCES:%.c=%.o)

         $(RANLIB) $@

 

@@ -58,19 +58,19 @@ lib-install:
 

 install: $(INSTALL)

 

-test.exe: test.c $(TARGETS)

+test.exe: tests/test.c $(TARGETS)

         $(CC) $(CFLAGS) -o $@ $< libdl.dll.a

 

-test-static.exe: test.c $(TARGETS)

+test-static.exe: tests/test.c $(TARGETS)

         $(CC) $(CFLAGS) -o $@ $< libdl.a

 

-testdll.dll: testdll.c

+testdll.dll: tests/testdll.c

         $(CC) $(CFLAGS) -shared -o $@ $^

 

-testdll2.dll: testdll2.c $(TARGETS)

+testdll2.dll: tests/testdll2.c $(TARGETS)

         $(CC) $(CFLAGS) -shared -o $@ $< -L. -ldl

 

-testdll3.dll: testdll3.c

+testdll3.dll: tests/testdll3.c

         $(CC) -shared -o $@ $^

 

 test: $(TARGETS) $(TESTS) testdll.dll testdll2.dll testdll3.dll

@@ -78,7 +78,7 @@ test: $(TARGETS) $(TESTS) testdll.dll testdll2.dll testdll3.dll
 

 clean::

         rm -f \

-                dlfcn.o \

+                src/dlfcn.o \

                 libdl.dll libdl.a libdl.def libdl.dll.a libdl.lib libdl.exp \

                 tmptest.c tmptest.dll \

                 test.exe test-static.exe testdll.dll testdll2.dll testdll3.dll

diff --git a/cmake-test/CMakeLists.txt b/cmake-test/CMakeLists.txt
index 659a79a..b191317 100644
--- a/cmake-test/CMakeLists.txt
+++ b/cmake-test/CMakeLists.txt
@@ -1,19 +1,20 @@
 # Simple CMake project to test the use of dlfcn-win32
 # imported target. The test compiled is the same compiled
 # as part of the main dlfcn-win32 project 
+project(dlfcn-win32-test)
 
 cmake_minimum_required(VERSION 3.0)
 
 find_package(dlfcn-win32 REQUIRED)
 
-add_library(testdll SHARED ../testdll.c)
+add_library(testdll SHARED ../tests/testdll.c)
 set_target_properties(testdll PROPERTIES PREFIX "")
-add_library(testdll2 SHARED ../testdll2.c)
+add_library(testdll2 SHARED ../tests/testdll2.c)
 set_target_properties(testdll2 PROPERTIES PREFIX "")
 target_link_libraries(testdll2 dlfcn-win32::dl)
-add_library(testdll3 SHARED ../testdll3.c)
+add_library(testdll3 SHARED ../tests/testdll3.c)
 set_target_properties(testdll3 PROPERTIES PREFIX "")
-add_executable(t_dlfcn ../test.c)
+add_executable(t_dlfcn ../tests/test.c)
 target_link_libraries(t_dlfcn dlfcn-win32::dl)
 enable_testing()
 add_test(NAME t_dlfcn COMMAND t_dlfcn)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644
index 0000000..d5296b1
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,43 @@
+set(headers dlfcn.h)
+set(sources dlfcn.c)
+
+if (BUILD_SHARED_LIBS)
+  add_definitions(-DSHARED)
+endif (BUILD_SHARED_LIBS)
+
+add_library(dl ${sources})
+
+# Correctly export the location of installed includes in the target
+target_include_directories(dl INTERFACE $<INSTALL_INTERFACE:include>)
+
+install (TARGETS dl EXPORT dlfcn-win32-targets
+                    RUNTIME DESTINATION bin
+                    LIBRARY DESTINATION lib${LIB_SUFFIX}
+                    ARCHIVE DESTINATION lib${LIB_SUFFIX})
+
+install (FILES ${headers} DESTINATION include)
+
+# Export the targets  (build tree)
+export(EXPORT dlfcn-win32-targets
+       FILE "${CMAKE_BINARY_DIR}/dlfcn-win32-targets.cmake"
+       NAMESPACE dlfcn-win32::
+)
+
+# Write the CMake config file
+set(CMAKE_CONF_INSTALL_DIR share/dlfcn-win32)
+set(INCLUDE_INSTALL_DIR include)
+include(CMakePackageConfigHelpers)
+configure_package_config_file(../dlfcn-win32-config.cmake.in ${CMAKE_BINARY_DIR}/dlfcn-win32-config.cmake
+                              INSTALL_DESTINATION ${CMAKE_CONF_INSTALL_DIR}
+                              PATH_VARS INCLUDE_INSTALL_DIR
+                              NO_CHECK_REQUIRED_COMPONENTS_MACRO)
+
+# Install the targets (install)
+install(EXPORT dlfcn-win32-targets
+        FILE dlfcn-win32-targets.cmake
+        NAMESPACE dlfcn-win32::
+        DESTINATION ${CMAKE_CONF_INSTALL_DIR})
+
+# Install the CMake config file
+install(FILES ${CMAKE_BINARY_DIR}/dlfcn-win32-config.cmake
+        DESTINATION ${CMAKE_CONF_INSTALL_DIR})
diff --git a/dlfcn.c b/src/dlfcn.c
index 532af91..532af91 100644
--- a/dlfcn.c
+++ b/src/dlfcn.c
diff --git a/dlfcn.h b/src/dlfcn.h
index 9ddbba3..9ddbba3 100644
--- a/dlfcn.h
+++ b/src/dlfcn.h
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
new file mode 100644
index 0000000..64f85f7
--- /dev/null
+++ b/tests/CMakeLists.txt
@@ -0,0 +1,12 @@
+enable_testing()
+include_directories(../src)
+add_library(testdll SHARED testdll.c)
+set_target_properties(testdll PROPERTIES PREFIX "")
+add_library(testdll2 SHARED testdll2.c)
+set_target_properties(testdll2 PROPERTIES PREFIX "")
+target_link_libraries(testdll2 dl)
+add_library(testdll3 SHARED testdll3.c)
+set_target_properties(testdll3 PROPERTIES PREFIX "")
+add_executable(t_dlfcn test.c)
+target_link_libraries(t_dlfcn dl)
+add_test (NAME t_dlfcn COMMAND t_dlfcn)
diff --git a/test.c b/tests/test.c
index 5d060d2..5d060d2 100644
--- a/test.c
+++ b/tests/test.c
diff --git a/testdll.c b/tests/testdll.c
index 5bb0f43..5bb0f43 100644
--- a/testdll.c
+++ b/tests/testdll.c
diff --git a/testdll2.c b/tests/testdll2.c
index 1560738..1560738 100644
--- a/testdll2.c
+++ b/tests/testdll2.c
diff --git a/testdll3.c b/tests/testdll3.c
index b6f4f5b..b6f4f5b 100644
--- a/testdll3.c
+++ b/tests/testdll3.c