Merge pull request ReFirmLabs#55 from revmischa/master

fix building on OSX with proper shared object extension
sorja · Jul 26, 2014 · 57789cd · 57789cd
2 parents a3baf4e + 8f9a880
commit 57789cd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/C/Makefile b/src/C/Makefile
@@ -4,13 +4,13 @@ LIB_DIR="../$(PYLIBDIR)"
 
 all:
 	make -C miniz
-	cp miniz/*.so $(LIB_DIR)
+	cp miniz/*.$(SOEXT) $(LIB_DIR)
 	make -C compress
-	cp compress/*.so $(LIB_DIR)
+	cp compress/*.$(SOEXT) $(LIB_DIR)
 
 clean_libs:
-	rm -f $(LIB_DIR)/libtinfl.so
-	rm -f $(LIB_DIR)/libcompress42.so
+	rm -f $(LIB_DIR)/libtinfl.$(SOEXT)
+	rm -f $(LIB_DIR)/libcompress42.$(SOEXT)
 
 clean: clean_libs
 	make -C miniz clean

diff --git a/src/bundles/Makefile b/src/bundles/Makefile
@@ -7,15 +7,15 @@ PYQTGRAPH_VERSION=`ls pyqtgraph-*.tar.gz | cut -d'-' -f2 | cut -d '.' -f1,2,3`
 
 all:
 	if [ "$(BUILD_FUZZY)" -eq "1" ]; then make -C ssdeep-$(SSDEEP_VERSION) libfuzzy.la; fi
-	if [ "$(BUILD_FUZZY)" -eq "1" ]; then cp ssdeep-$(SSDEEP_VERSION)/.libs/libfuzzy.so $(LIB_DIR); fi
+	if [ "$(BUILD_FUZZY)" -eq "1" ]; then cp ssdeep-$(SSDEEP_VERSION)/.libs/libfuzzy.$(SOEXT) $(LIB_DIR); fi
 	if [ "$(BUILD_MAGIC)" -eq "1" ]; then make -C file-$(FILE_VERSION)/src magic.h; fi # This must be done first for OSX, else MAGIC_VERSION is undefined
 	if [ "$(BUILD_MAGIC)" -eq "1" ]; then make -C file-$(FILE_VERSION)/src libmagic.la; fi
-	if [ "$(BUILD_MAGIC)" -eq "1" ]; then cp file-$(FILE_VERSION)/src/.libs/libmagic.so $(LIB_DIR); fi
+	if [ "$(BUILD_MAGIC)" -eq "1" ]; then cp file-$(FILE_VERSION)/src/.libs/libmagic.$(SOEXT) $(LIB_DIR); fi
 	if [ "$(BUILD_PYQTGRAPH)" -eq "1" ]; then cp -R pyqtgraph-$(PYQTGRAPH_VERSION)/pyqtgraph $(LIB_DIR)/; fi
 
 clean_libs:
-	rm -f $(LIB_DIR)/libmagic.so
-	rm -f $(LIB_DIR)/libfuzzy.so
+	rm -f $(LIB_DIR)/libmagic.$(SOEXT)
+	rm -f $(LIB_DIR)/libfuzzy.$(SOEXT)
 	rm -rf $(LIB_DIR)/pyqtgraph
 
 clean: clean_libs