Commit a2734c7f by devttys0

Fixed makefile comparison bugs

parent 79e8402c
...@@ -40,21 +40,21 @@ ida: build ...@@ -40,21 +40,21 @@ ida: build
if [ "$(IDA_DIR)" != "" ] && [ -e "$(IDA_DIR)/python/lib/python2.7" ]; then cp -R $(SRC_DIR)/binwalk $(IDA_DIR)/python/lib/python2.7/; fi if [ "$(IDA_DIR)" != "" ] && [ -e "$(IDA_DIR)/python/lib/python2.7" ]; then cp -R $(SRC_DIR)/binwalk $(IDA_DIR)/python/lib/python2.7/; fi
build: build:
if [ "$(BUILD_C_LIBS)" -eq "yes" ]; then make -C $(SRC_C_DIR); fi if [ "$(BUILD_C_LIBS)" = "yes" ]; then make -C $(SRC_C_DIR); fi
if [ "$(BUILD_BUNDLES)" -eq "yes" ]; then make -C $(SRC_BUNDLES_DIR); fi if [ "$(BUILD_BUNDLES)" = "yes" ]; then make -C $(SRC_BUNDLES_DIR); fi
$(PYTHON) ./setup.py build $(PYTHON) ./setup.py build
deps: deps:
./deps.sh ./deps.sh
clean: clean:
if [ "$(BUILD_C_LIBS)" -eq "yes" ]; then make -C $(SRC_C_DIR) clean; fi if [ "$(BUILD_C_LIBS)" = "yes" ]; then make -C $(SRC_C_DIR) clean; fi
if [ "$(BUILD_BUNDLES)" -eq "yes" ]; then make -C $(SRC_BUNDLES_DIR) clean; fi if [ "$(BUILD_BUNDLES)" = "yes" ]; then make -C $(SRC_BUNDLES_DIR) clean; fi
$(PYTHON) ./setup.py clean $(PYTHON) ./setup.py clean
distclean: clean distclean: clean
if [ "$(BUILD_C_LIBS)" -eq "yes" ]; then make -C $(SRC_C_DIR) distclean; fi if [ "$(BUILD_C_LIBS)" = "yes" ]; then make -C $(SRC_C_DIR) distclean; fi
if [ "$(BUILD_BUNDLES)" -eq "yes" ]; then make -C $(SRC_BUNDLES_DIR) distclean; fi if [ "$(BUILD_BUNDLES)" = "yes" ]; then make -C $(SRC_BUNDLES_DIR) distclean; fi
rm -rf Makefile config.* *.cache rm -rf Makefile config.* *.cache
uninstall: uninstall:
......
...@@ -11,7 +11,7 @@ class LZMAModPlugin(binwalk.core.plugin.Plugin): ...@@ -11,7 +11,7 @@ class LZMAModPlugin(binwalk.core.plugin.Plugin):
''' '''
MODULES = ['Signature'] MODULES = ['Signature']
FAKE_LZMA_SIZE = "\x00\x00\x00\x10\x00\x00\x00\x00" FAKE_LZMA_SIZE = "\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF"
SIGNATURE = "lzma compressed data" SIGNATURE = "lzma compressed data"
def init(self): def init(self):
......
...@@ -6,12 +6,12 @@ PYQTGRAPH_VERSION=`ls pyqtgraph-*.tar.gz | cut -d'-' -f2 | cut -d '.' -f1,2,3` ...@@ -6,12 +6,12 @@ PYQTGRAPH_VERSION=`ls pyqtgraph-*.tar.gz | cut -d'-' -f2 | cut -d '.' -f1,2,3`
.PHONY: all clean_libs clean distclean .PHONY: all clean_libs clean distclean
all: all:
if [ "$(BUILD_FUZZY)" -eq "yes" ]; then make -C ssdeep-$(SSDEEP_VERSION) libfuzzy.la; fi if [ "$(BUILD_FUZZY)" = "yes" ]; then make -C ssdeep-$(SSDEEP_VERSION) libfuzzy.la; fi
if [ "$(BUILD_FUZZY)" -eq "yes" ]; then cp ssdeep-$(SSDEEP_VERSION)/.libs/libfuzzy.$(SOEXT) $(LIB_DIR); fi if [ "$(BUILD_FUZZY)" = "yes" ]; then cp ssdeep-$(SSDEEP_VERSION)/.libs/libfuzzy.$(SOEXT) $(LIB_DIR); fi
if [ "$(BUILD_MAGIC)" -eq "yes" ]; 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)" = "yes" ]; 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 "yes" ]; then make -C file-$(FILE_VERSION)/src libmagic.la; fi if [ "$(BUILD_MAGIC)" = "yes" ]; then make -C file-$(FILE_VERSION)/src libmagic.la; fi
if [ "$(BUILD_MAGIC)" -eq "yes" ]; then cp file-$(FILE_VERSION)/src/.libs/libmagic.$(SOEXT) $(LIB_DIR); fi if [ "$(BUILD_MAGIC)" = "yes" ]; then cp file-$(FILE_VERSION)/src/.libs/libmagic.$(SOEXT) $(LIB_DIR); fi
if [ "$(BUILD_PYQTGRAPH)" -eq "yes" ] && [ ! -e $(LIB_DIR)/pyqtgraph ]; then cp -R pyqtgraph-$(PYQTGRAPH_VERSION)/pyqtgraph $(LIB_DIR)/; fi if [ "$(BUILD_PYQTGRAPH)" = "yes" ] && [ ! -e $(LIB_DIR)/pyqtgraph ]; then cp -R pyqtgraph-$(PYQTGRAPH_VERSION)/pyqtgraph $(LIB_DIR)/; fi
clean_libs: clean_libs:
rm -f $(LIB_DIR)/libmagic.$(SOEXT) rm -f $(LIB_DIR)/libmagic.$(SOEXT)
...@@ -19,8 +19,8 @@ clean_libs: ...@@ -19,8 +19,8 @@ clean_libs:
rm -rf $(LIB_DIR)/pyqtgraph rm -rf $(LIB_DIR)/pyqtgraph
clean: clean_libs clean: clean_libs
if [ "$(BUILD_FUZZY)" -eq "yes" ]; then make -C ssdeep-$(SSDEEP_VERSION) clean; fi if [ "$(BUILD_FUZZY)" = "yes" ]; then make -C ssdeep-$(SSDEEP_VERSION) clean; fi
if [ "$(BUILD_MAGIC)" -eq "yes" ]; then make -C file-$(FILE_VERSION) clean; fi if [ "$(BUILD_MAGIC)" = "yes" ]; then make -C file-$(FILE_VERSION) clean; fi
distclean: clean_libs distclean: clean_libs
rm -rf ./ssdeep-$(SSDEEP_VERSION) rm -rf ./ssdeep-$(SSDEEP_VERSION)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment