diff --git a/Makefile.in b/Makefile.in new file mode 100644 index 0000000..0044878 --- /dev/null +++ b/Makefile.in @@ -0,0 +1,29 @@ +PYTHON="python" +SRC_C_DIR="./src/C" + +.PHONY: all install build dependencies clean uninstall + +all: install + +install: build + make -c $(SRC_C_DIR) install + $(PYTHON) ./setup.py install + +build: + make -C $(SRC_C_DIR) + $(PYTHON) ./setup.py build + +dependencies: + ./deps.sh + +clean: + make -C $(SRC_C_DIR) clean + $(PYTHON) ./setup.py clean + +distclean: clean + make -C $(SRC_C_DIR) distclean + rm -f Makefile + +uninstall: + make -C $(SRC_C_DIR) uninstall + $(PYTHON) ./setup.py uninstall diff --git a/configure b/configure new file mode 100755 index 0000000..36ce24d --- /dev/null +++ b/configure @@ -0,0 +1,3 @@ +#!/bin/sh + +cd ./src/C/ && ./configure && cd - && cp Makefile.in Makefile diff --git a/easy_install.sh b/deps.sh similarity index 72% rename from easy_install.sh rename to deps.sh index 09a2b24..53aca33 100755 --- a/easy_install.sh +++ b/deps.sh @@ -35,37 +35,27 @@ function fmk cd - } -function libmagic -{ - SITE="ftp://ftp.astron.com/pub/file/" - VERSION="5.11" - OUTFILE="file-$VERSION.tar.gz" - URL="$SITE$OUTFILE" - - echo "Downloading '$URL'..." - wget "$URL" - - if [ -e "$OUTFILE" ] - then - echo "Installing libmagic / python-magic..." - tar -zxvf "$OUTFILE" - cd "file-$VERSION" && ./configure && make && $SUDO make install && cd python && $SUDO python ./setup.py install && cd ../.. - $SUDO rm -rf "file-$VERSION" "$OUTFILE" - else - echo "ERROR: Failed to download '$URL'!" - echo "libmagic not installed." - fi -} - -function libfuzzy -{ - VERSION="ssdeep-2.10" - cd ./C - tar -zxvf $VERSION.tar.gz && cd $VERSION && ./configure && make && $SUDO make install - cd .. - rm -rf $VERSION - cd .. -} +#function libmagic +#{ +# SITE="ftp://ftp.astron.com/pub/file/" +# VERSION="5.11" +# OUTFILE="file-$VERSION.tar.gz" +# URL="$SITE$OUTFILE" +# +# echo "Downloading '$URL'..." +# wget "$URL" +# +# if [ -e "$OUTFILE" ] +# then +# echo "Installing libmagic / python-magic..." +# tar -zxvf "$OUTFILE" +# cd "file-$VERSION" && ./configure && make && $SUDO make install && cd python && $SUDO python ./setup.py install && cd ../.. +# $SUDO rm -rf "file-$VERSION" "$OUTFILE" +# else +# echo "ERROR: Failed to download '$URL'!" +# echo "libmagic not installed." +# fi +#} function pyqtgraph { @@ -186,27 +176,18 @@ case $DISTRO in exit 1 esac -if [ "$(python -c 'import magic; print (magic.MAGIC_NO_CHECK_TEXT)' 2>/dev/null)" == "" ] -then - echo "python-magic not installed, or wrong version; building from source..." - libmagic -fi - -if [ "$(python -c 'import pyqtgraph; print (pyqtgraph.__file__)' 2>/dev/null)" == "" ] -then - echo "pyqtgraph not installed; building from source..." - pyqtgraph -fi - -#if [ "$(python -c 'import ctypes.util; print (ctypes.util.find_library("fuzzy"))')" == "None" ] +#if [ "$(python -c 'import magic; print (magic.MAGIC_NO_CHECK_TEXT)' 2>/dev/null)" == "" ] #then -# echo "libfuzzy not installed; building from source..." -# libfuzzy +# echo "python-magic not installed, or wrong version; building from source..." +# libmagic #fi # Get and build the firmware mod kit fmk -# Install binwalk -$SUDO python setup.py install +if [ "$(python -c 'import pyqtgraph; print (pyqtgraph.__file__)' 2>/dev/null)" == "" ] +then + echo "pyqtgraph not installed; building from source..." + pyqtgraph +fi diff --git a/src/C/Makefile.in b/src/C/Makefile.in index 3483e51..4acdc5a 100644 --- a/src/C/Makefile.in +++ b/src/C/Makefile.in @@ -7,7 +7,9 @@ export exec_prefix=@exec_prefix@ export LIBDIR=@libdir@ export INSTALL_OPTIONS=@INSTALL_OPTIONS@ -all: clean +.PHONY: all install clean distclean + +all: make -C miniz make -C compress make -C fuzzy @@ -17,8 +19,6 @@ install: make -C compress install make -C fuzzy install -.PHONY: clean distclean - clean: make -C miniz clean make -C compress clean