Commit 67c5aeb3 by Bertrand Mesot

Merge branch 'apply-cppflags'

See merge request !3
parents 2a7f01de 72a0e72c
......@@ -22,10 +22,6 @@ prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = $(exec_prefix)/bin
CC = @CC@
CFLAGS = @CFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
INSTALL = @INSTALL@
PACKAGE = @PACKAGE_NAME@
......
......@@ -20,6 +20,7 @@ SHELL = /bin/sh
CC = @CC@
CPPFLAGS = @CPPFLAGS@
CFLAGS = @CFLAGS@ -Icore -Intproba
LDFLAGS = @LDFLAGS@ @LIBS@
......@@ -46,7 +47,7 @@ $(SUBDIRS):
ophcrack: gui/main.cpp core ntproba samdump2
cp $< main.c
$(CC) $(CFLAGS) -c main.c -o main.o
$(CC) $(CPPFLAGS) $(CFLAGS) -c main.c -o main.o
$(CC) main.o $(ARCHIVES) -o $@ $(LDFLAGS)
rm main.c main.o
......
......@@ -22,6 +22,7 @@ CC = @CC@
RANLIB = @RANLIB@
CFLAGS = @CFLAGS@
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@ @LIBS@
HEADERS = $(wildcard *.h)
......@@ -35,7 +36,7 @@ all:
$(RANLIB) $@
%.o: %.c
$(CC) $(CFLAGS) -c $< -o $@
$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
clean_:
rm -f *.o *~
......@@ -49,6 +50,6 @@ distclean_: clean
distclean: distclean_
.depend: $(HEADERS) $(SOURCES)
$(CC) $(CFLAGS) -MM $^ >.depend
$(CC) $(CPPFLAGS) $(CFLAGS) -MM $^ >.depend
-include .depend
......@@ -35,8 +35,8 @@ QMAKE_CC = @CC@
QMAKE_CXX = @CXX@
QMAKE_LINK = @CXX@
QMAKE_CFLAGS += @CFLAGS@
QMAKE_CXXFLAGS += @CXXFLAGS@ @QWT_INCLUDES@
QMAKE_CFLAGS += @CPPFLAGS@ @CFLAGS@
QMAKE_CXXFLAGS += @CPPFLAGS@ @CXXFLAGS@ @QWT_INCLUDES@
# Input
......
......@@ -17,7 +17,7 @@
include ../common.mk
CFLAGS = -g -Wall -std=gnu9x -pedantic -I../.. -I../core -I../ntproba
CFLAGS += -I../.. -I../core -I../ntproba
ARCHIVES = \
../core/libophcrack.a \
......
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