Removed obsolete entries from install: target.
[hashcat.git] / src / Makefile
index 4cc1975..73cf662 100644 (file)
@@ -1,11 +1,12 @@
 ##
 ## Authors.....: Jens Steube <jens.steube@gmail.com>
 ##               Gabriele Gristina <matrix@hashcat.net>
+##               magnum <john.magnum@hushmail.com>
 ##
 ## License.....: MIT
 ##
 
-PROG_NAME                := oclHashcat
+PROG_NAME                := hashcat
 
 ##
 ## Detect Operating System
@@ -43,50 +44,11 @@ DOCUMENT_FOLDER          ?= $(PREFIX)/share/doc/$(PROG_NAME)
 
 ##
 ## Dependencies
-##
-
-ADL                      := deps/adl-sdk
-GDK                      := deps/nvidia-gdk
-NVAPI                    := deps/R352-developer
-
-##
-## Dependencies, cross compilation only
+## You may ignore them if you have your own headers somewhere
 ##
 
 OPENCL_HEADERS_KHRONOS   := deps/OpenCL-Headers
 
-##
-## Library paths
-##
-
-NVML                     := $(GDK)/usr/include/nvidia/gdk
-
-##
-## Check dependencies
-##
-
-FOUND_ADL                := 0
-FOUND_NVML               := 0
-FOUND_NVAPI              := 0
-
-ifneq ($(wildcard $(ADL)/include/adl_sdk.h),)
-FOUND_ADL                := 1
-endif
-
-ifneq ($(wildcard $(NVML)/nvml.h),)
-FOUND_NVML               := 1
-endif
-
-ifneq ($(wildcard $(NVAPI)/nvapi.h),)
-FOUND_NVAPI              := 1
-endif
-
-ifeq ($(DEBUG),1)
-$(warning "## ADL is found ? $(FOUND_ADL)")
-$(warning "## NVML is found ? $(FOUND_NVML)")
-$(warning "## NVAPI is found ? $(FOUND_NVAPI)")
-endif
-
 ##
 ## Native compiler paths
 ##
@@ -107,23 +69,27 @@ CC_LINUX_64              := gcc
 CC_WIN_32                := i686-w64-mingw32-gcc
 CC_WIN_64                := x86_64-w64-mingw32-gcc
 
-DLL_WIN_32               := i686-w64-mingw32-dlltool
-DLL_WIN_64               := x86_64-w64-mingw32-dlltool
-
 ##
 ## Misc stuff
 ##
 
-NOW                      := $(shell date +%s)
+COMPTIME                 := $(shell date +%s)
+VERSION_EXPORT           := $Format:%D$
+VERSION_TAG              := $(shell test -d .git && git describe --tags --dirty=+ || echo "$(VERSION_EXPORT)"|cut -d, -f2|sed -r 's|.* (\w+/)?([^ ]+)|\2|')
 
 ##
 ## Compiler flags
 ##
 
-CFLAGS                   := -O2 -pipe -W -Wall -std=c99 -Iinclude/
+CFLAGS                   := -pipe -W -Wall -std=c99 -Iinclude/ -IOpenCL/ -I$(OPENCL_HEADERS_KHRONOS)/
 
-ifeq ($(DEBUG),1)
-CFLAGS                   += -g -ggdb -fsanitize=address -fno-omit-frame-pointer
+ifndef DEBUG
+CFLAGS                   += -O2
+else
+CFLAGS                   += -DDEBUG -g -ggdb
+ifeq ($(DEBUG),2)
+CFLAGS                   += -fsanitize=address -fno-omit-frame-pointer
+endif
 endif
 
 ##
@@ -134,77 +100,48 @@ BINARY_NATIVE            := $(PROG_NAME)
 
 ifeq ($(UNAME),Darwin)
 export MACOSX_DEPLOYMENT_TARGET=10.9
-
-BINARY_NATIVE            := $(PROG_NAME).app
-
+BINARY_NATIVE            := $(BINARY_NATIVE).app
 CFLAGS_NATIVE            := -D_POSIX -DOSX
 CFLAGS_NATIVE            += $(CFLAGS)
-
-LFLAGS_NATIVE            := -framework OpenCL -lpthread
-
-FOUND_ADL                := 0
-FOUND_NVML               := 0
-endif
+LFLAGS_NATIVE            := -lpthread
+endif # darwin
 
 ifeq ($(UNAME),Linux)
 CFLAGS_NATIVE            := -D_POSIX -DLINUX
-CFLAGS_NATIVE            += -s $(CFLAGS)
-
-LFLAGS_NATIVE            := -lOpenCL -lpthread
-
-ifneq (,$(filter 1,$(FOUND_ADL) $(FOUND_NVML)))
-LFLAGS_NATIVE            += -ldl
-CFLAGS_NATIVE            += -DHAVE_HWMON
-ifeq ($(FOUND_ADL),1)
-CFLAGS_NATIVE            += -DHAVE_ADL -I$(ADL)/include/
-endif
-ifeq ($(FOUND_NVML),1)
-CFLAGS_NATIVE            += -DHAVE_NVML -I$(NVML)/
-endif
-endif
-
+ifndef DEBUG
+CFLAGS_NATIVE            += -s
 endif
+CFLAGS_NATIVE            += $(CFLAGS)
+LFLAGS_NATIVE            := -lpthread -ldl
+CFLAGS_NATIVE            += -DHAVE_HWMON
+endif # linux
 
 ##
 ## Cross compilation target
 ##
 
 CFLAGS_CROSS_LINUX       := -D_POSIX -DLINUX
-CFLAGS_CROSS_LINUX       += -s $(CFLAGS)
-CFLAGS_CROSS_LINUX       += -I$(OPENCL_HEADERS_KHRONOS)/
-
-ifneq (,$(filter 1,$(FOUND_ADL) $(FOUND_NVML)))
-CFLAGS_CROSS_LINUX       += -DHAVE_HWMON
 
-ifeq ($(FOUND_ADL),1)
-CFLAGS_CROSS_LINUX       += -DHAVE_ADL -I$(ADL)/include/
+ifndef DEBUG
+CFLAGS_CROSS_LINUX       += -s
 endif
 
-ifeq ($(FOUND_NVML),1)
-CFLAGS_CROSS_LINUX       += -DHAVE_NVML -I$(NVML)/
-endif
-endif
-
-CFLAGS_CROSS_WIN         := -D_WIN   -DWIN -D__MSVCRT__ -D__USE_MINGW_ANSI_STDIO=1
-CFLAGS_CROSS_WIN         += -s $(filter-out -fsanitize=address,$(CFLAGS))
-CFLAGS_CROSS_WIN         += -I$(OPENCL_HEADERS_KHRONOS)/
+CFLAGS_CROSS_LINUX       += $(CFLAGS)
+CFLAGS_CROSS_LINUX       += -DHAVE_HWMON
 
-ifneq (,$(filter 1,$(FOUND_ADL) $(FOUND_NVAPI)))
-CFLAGS_CROSS_WIN         += -DHAVE_HWMON
+CFLAGS_CROSS_WIN         := -D_WIN -DWIN -D__MSVCRT__ -D__USE_MINGW_ANSI_STDIO=1
 
-ifeq ($(FOUND_ADL),1)
-CFLAGS_CROSS_WIN         += -DHAVE_ADL -I$(ADL)/include/
+ifndef DEBUG
+CFLAGS_CROSS_WIN         += -s
 endif
 
-ifeq ($(FOUND_NVAPI),1)
-CFLAGS_CROSS_WIN         += -DHAVE_NVAPI -I$(NVAPI)/
-endif
-endif
+CFLAGS_CROSS_WIN         += $(filter-out -fsanitize=address,$(CFLAGS))
+CFLAGS_CROSS_WIN         += -DHAVE_HWMON
 
 CFLAGS_CROSS_32          := -m32
 CFLAGS_CROSS_64          := -m64
 
-LFLAGS_CROSS_LINUX       := -lpthread -lOpenCL -ldl
+LFLAGS_CROSS_LINUX       := -lpthread -ldl
 LFLAGS_CROSS_WIN         := -lpsapi
 
 ##
@@ -213,60 +150,42 @@ LFLAGS_CROSS_WIN         := -lpsapi
 
 NATIVE_OBJS              := obj/ext_OpenCL.NATIVE.o obj/shared.NATIVE.o obj/rp_kernel_on_cpu.NATIVE.o
 
-ifneq (,$(filter 1,$(FOUND_ADL) $(FOUND_NVML)))
-ifeq ($(FOUND_ADL),1)
+ifeq ($(UNAME),Linux)
 NATIVE_OBJS              += obj/ext_ADL.NATIVE.o
-endif
-
-ifeq ($(FOUND_NVML),1)
+NATIVE_OBJS              += obj/ext_nvapi.NATIVE.o
 NATIVE_OBJS              += obj/ext_nvml.NATIVE.o
 endif
-endif
 
-LINUX_32_OBJS            := obj/ext_OpenCL.LINUX.32.o obj/shared.LINUX.32.o obj/rp_kernel_on_cpu.LINUX.32.o
-LINUX_64_OBJS            := obj/ext_OpenCL.LINUX.64.o obj/shared.LINUX.64.o obj/rp_kernel_on_cpu.LINUX.64.o
+LINUX_32_OBJS            := obj/ext_OpenCL.LINUX.32.o obj/shared.LINUX.32.o obj/rp_kernel_on_cpu.LINUX.32.o obj/ext_ADL.LINUX.32.o obj/ext_nvml.LINUX.32.o obj/ext_nvapi.LINUX.32.o
+LINUX_64_OBJS            := obj/ext_OpenCL.LINUX.64.o obj/shared.LINUX.64.o obj/rp_kernel_on_cpu.LINUX.64.o obj/ext_ADL.LINUX.64.o obj/ext_nvml.LINUX.64.o obj/ext_nvapi.LINUX.64.o
 
-WIN_32_OBJS              := obj/ext_OpenCL.WIN.32.o obj/shared.WIN.32.o obj/rp_kernel_on_cpu.WIN.32.o
-WIN_64_OBJS              := obj/ext_OpenCL.WIN.64.o obj/shared.WIN.64.o obj/rp_kernel_on_cpu.WIN.64.o
+## may need to adjust according to your mingw distribution
+CRT_GLOB_32              := /usr/i686-w64-mingw32/lib/CRT_glob.o
+CRT_GLOB_64              := /usr/x86_64-w64-mingw32/lib/CRT_glob.o
 
-ifeq ($(FOUND_ADL),1)
-LINUX_32_OBJS            += obj/ext_ADL.LINUX.32.o
-LINUX_64_OBJS            += obj/ext_ADL.LINUX.64.o
-
-WIN_32_OBJS              += obj/ext_ADL.WIN.32.o
-WIN_64_OBJS              += obj/ext_ADL.WIN.64.o
-endif
-
-ifeq ($(FOUND_NVML),1)
-LINUX_32_OBJS            += obj/ext_nvml.LINUX.32.o
-LINUX_64_OBJS            += obj/ext_nvml.LINUX.64.o
-endif
-
-ifeq ($(FOUND_NVAPI),1)
-WIN_32_OBJS              += obj/ext_nvapi.WIN.32.o $(NVAPI)/x86/nvapi.lib
-WIN_64_OBJS              += obj/ext_nvapi.WIN.64.o $(NVAPI)/amd64/nvapi64.lib
-endif
+WIN_32_OBJS              := obj/ext_OpenCL.WIN.32.o   obj/shared.WIN.32.o   obj/rp_kernel_on_cpu.WIN.32.o   obj/ext_ADL.WIN.32.o   obj/ext_nvml.WIN.32.o   obj/ext_nvapi.WIN.32.o   $(CRT_GLOB_32)
+WIN_64_OBJS              := obj/ext_OpenCL.WIN.64.o   obj/shared.WIN.64.o   obj/rp_kernel_on_cpu.WIN.64.o   obj/ext_ADL.WIN.64.o   obj/ext_nvml.WIN.64.o   obj/ext_nvapi.WIN.64.o   $(CRT_GLOB_64)
 
 ##
 ## Targets: Global
 ##
 
-native: oclHashcat
+native: hashcat
 
 binaries: linux32 linux64 win32 win64
 
 clean:
-       $(RM) -f obj/*.o lib/*.a *.bin *.exe *.app *.restore *.out *.pot *.dictstat *.log oclHashcat core
+       $(RM) -f obj/*.o *.bin *.exe *.app *.restore *.out *.pot *.dictstat *.log hashcat core
        $(RM) -rf *.induct
        $(RM) -rf *.outfiles
        $(RM) -rf *.dSYM
        $(RM) -rf kernels
 
-linux32: oclHashcat32.bin
-linux64: oclHashcat64.bin
+linux32: hashcat32.bin
+linux64: hashcat64.bin
 
-win32: oclHashcat32.exe
-win64: oclHashcat64.exe
+win32: hashcat32.exe
+win64: hashcat64.exe
 
 ##
 ## Targets: Linux install
@@ -286,16 +205,12 @@ install: native
        $(CP) -a charsets/*                             $(SHARED_FOLDER)/charsets/
        $(INSTALL) -m 755 -d                            $(SHARED_FOLDER)/masks
        $(CP) -a masks/*                                $(SHARED_FOLDER)/masks/
-       $(INSTALL) -m 755 -d                            $(SHARED_FOLDER)/include
-       $(INSTALL) -m 644 include/constants.h           $(SHARED_FOLDER)/include/
-       $(INSTALL) -m 644 include/kernel_functions.c    $(SHARED_FOLDER)/include/
-       $(INSTALL) -m 644 include/kernel_vendor.h       $(SHARED_FOLDER)/include/
-       $(INSTALL) -m 644 include/rp_kernel.h           $(SHARED_FOLDER)/include/
        $(INSTALL) -m 755 -d                            $(SHARED_FOLDER)/OpenCL
        $(CP) -a OpenCL/*                               $(SHARED_FOLDER)/OpenCL/
        $(INSTALL) -m 755 -d                            $(SHARED_FOLDER)/rules
        $(CP) -a rules/*                                $(SHARED_FOLDER)/rules/
        $(INSTALL) -m 644 hashcat.hcstat                $(SHARED_FOLDER)/
+       $(INSTALL) -m 644 hashcat.hctune                $(SHARED_FOLDER)/
        $(INSTALL) -m 755 $(BINARY_NATIVE)              $(INSTALL_FOLDER)/
 
 uninstall:
@@ -304,49 +219,39 @@ uninstall:
        $(RM) -rf $(DOCUMENT_FOLDER)
 
 ##
-## Targets: Libraries
-##
-
-lib/libOpenCL.a:
-       $(DLL_WIN_32) -A -k -l lib/libOpenCL.a   -d lib/OpenCL.def
-
-lib/libOpenCL64.a:
-       $(DLL_WIN_64) -A -k -l lib/libOpenCL64.a -d lib/OpenCL64.def
-
-##
-## native compiled oclHashcat
+## native compiled hashcat
 ##
 
 obj/%.NATIVE.o:   src/%.c
        $(CC_NATIVE) $(CFLAGS_NATIVE) -c -o $@ $<
 
-oclHashcat:       src/oclHashcat.c $(NATIVE_OBJS)
-       $(CC_NATIVE) $(CFLAGS_NATIVE)    -o $(BINARY_NATIVE) $^ $(LFLAGS_NATIVE) -DCOMPTIME=$(NOW) -DINSTALL_FOLDER=\"$(INSTALL_FOLDER)\" -DSHARED_FOLDER=\"$(SHARED_FOLDER)\" -DDOCUMENT_FOLDER=\"$(DOCUMENT_FOLDER)\"
+hashcat:       src/hashcat.c $(NATIVE_OBJS)
+       $(CC_NATIVE) $(CFLAGS_NATIVE)    -o $(BINARY_NATIVE) $^ $(LFLAGS_NATIVE) -DCOMPTIME=$(COMPTIME) -DVERSION_TAG=\"$(VERSION_TAG)\" -DINSTALL_FOLDER=\"$(INSTALL_FOLDER)\" -DSHARED_FOLDER=\"$(SHARED_FOLDER)\" -DDOCUMENT_FOLDER=\"$(DOCUMENT_FOLDER)\"
 
 ##
-## cross compiled oclHashcat for binary release version
+## cross compiled hashcat for binary release version
 ##
 
 obj/%.LINUX.32.o: src/%.c
-       $(CC_LINUX_32) $(CFLAGS_CROSS_LINUX) $(CFLAGS_CROSS_32) -c -o $@ $<
+       $(CC_LINUX_32) -D_LINUX32 $(CFLAGS_CROSS_LINUX) $(CFLAGS_CROSS_32) -c -o $@ $<
 
 obj/%.LINUX.64.o: src/%.c
-       $(CC_LINUX_64) $(CFLAGS_CROSS_LINUX) $(CFLAGS_CROSS_64) -c -o $@ $<
+       $(CC_LINUX_64) -D_LINUX64 $(CFLAGS_CROSS_LINUX) $(CFLAGS_CROSS_64) -c -o $@ $<
 
 obj/%.WIN.32.o:   src/%.c
-       $(CC_WIN_32)   $(CFLAGS_CROSS_WIN)   $(CFLAGS_CROSS_32) -c -o $@ $<
+       $(CC_WIN_32)   -D_WIN32   $(CFLAGS_CROSS_WIN)   $(CFLAGS_CROSS_32) -c -o $@ $<
 
 obj/%.WIN.64.o:   src/%.c
-       $(CC_WIN_64)   $(CFLAGS_CROSS_WIN)   $(CFLAGS_CROSS_64) -c -o $@ $<
+       $(CC_WIN_64)   -D_WIN64   $(CFLAGS_CROSS_WIN)   $(CFLAGS_CROSS_64) -c -o $@ $<
 
-oclHashcat32.bin: src/oclHashcat.c $(LINUX_32_OBJS)
-       $(CC_LINUX_32) $(CFLAGS_CROSS_LINUX) $(CFLAGS_CROSS_32)    -o $@ $^ $(LFLAGS_CROSS_LINUX) -DCOMPTIME=$(NOW) -DINSTALL_FOLDER=\"$(INSTALL_FOLDER)\" -DSHARED_FOLDER=\"$(SHARED_FOLDER)\" -DDOCUMENT_FOLDER=\"$(DOCUMENT_FOLDER)\"
+hashcat32.bin: src/hashcat.c $(LINUX_32_OBJS)
+       $(CC_LINUX_32) -D_LINUX32 $(CFLAGS_CROSS_LINUX) $(CFLAGS_CROSS_32)    -o $@ $^ $(LFLAGS_CROSS_LINUX) -DCOMPTIME=$(COMPTIME) -DVERSION_TAG=\"$(VERSION_TAG)\" -DINSTALL_FOLDER=\"$(INSTALL_FOLDER)\" -DSHARED_FOLDER=\"$(SHARED_FOLDER)\" -DDOCUMENT_FOLDER=\"$(DOCUMENT_FOLDER)\"
 
-oclHashcat64.bin: src/oclHashcat.c $(LINUX_64_OBJS)
-       $(CC_LINUX_64) $(CFLAGS_CROSS_LINUX) $(CFLAGS_CROSS_64)    -o $@ $^ $(LFLAGS_CROSS_LINUX) -DCOMPTIME=$(NOW) -DINSTALL_FOLDER=\"$(INSTALL_FOLDER)\" -DSHARED_FOLDER=\"$(SHARED_FOLDER)\" -DDOCUMENT_FOLDER=\"$(DOCUMENT_FOLDER)\"
+hashcat64.bin: src/hashcat.c $(LINUX_64_OBJS)
+       $(CC_LINUX_64) -D_LINUX64 $(CFLAGS_CROSS_LINUX) $(CFLAGS_CROSS_64)    -o $@ $^ $(LFLAGS_CROSS_LINUX) -DCOMPTIME=$(COMPTIME) -DVERSION_TAG=\"$(VERSION_TAG)\" -DINSTALL_FOLDER=\"$(INSTALL_FOLDER)\" -DSHARED_FOLDER=\"$(SHARED_FOLDER)\" -DDOCUMENT_FOLDER=\"$(DOCUMENT_FOLDER)\"
 
-oclHashcat32.exe: src/oclHashcat.c $(WIN_32_OBJS) lib/libOpenCL.a
-       $(CC_WIN_32)   $(CFLAGS_CROSS_WIN)   $(CFLAGS_CROSS_32)    -o $@ $^ $(LFLAGS_CROSS_WIN)   -DCOMPTIME=$(NOW) -static-libgcc
+hashcat32.exe: src/hashcat.c $(WIN_32_OBJS)
+       $(CC_WIN_32)   -D_WIN32   $(CFLAGS_CROSS_WIN)   $(CFLAGS_CROSS_32)    -o $@ $^ $(LFLAGS_CROSS_WIN)   -DCOMPTIME=$(COMPTIME) -DVERSION_TAG=\"$(VERSION_TAG)\" -static-libgcc
 
-oclHashcat64.exe: src/oclHashcat.c $(WIN_64_OBJS) lib/libOpenCL64.a
-       $(CC_WIN_64)   $(CFLAGS_CROSS_WIN)   $(CFLAGS_CROSS_64)    -o $@ $^ $(LFLAGS_CROSS_WIN)   -DCOMPTIME=$(NOW) -static-libgcc
+hashcat64.exe: src/hashcat.c $(WIN_64_OBJS)
+       $(CC_WIN_64)   -D_WIN64   $(CFLAGS_CROSS_WIN)   $(CFLAGS_CROSS_64)    -o $@ $^ $(LFLAGS_CROSS_WIN)   -DCOMPTIME=$(COMPTIME) -DVERSION_TAG=\"$(VERSION_TAG)\" -static-libgcc