From a621d83217b350960eb18ca7e596e8597941aa7e Mon Sep 17 00:00:00 2001 From: jdh8d <jdh8d@git.zephyr-software.com> Date: Thu, 5 Feb 2015 20:42:00 +0000 Subject: [PATCH] --- .gitattributes | 4 ++-- Makefile => Makefile.in | 6 +++++- src/{Makefile => Makefile.in} | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) rename Makefile => Makefile.in (56%) rename src/{Makefile => Makefile.in} (97%) diff --git a/.gitattributes b/.gitattributes index 605cd0f..f588041 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,6 +1,6 @@ * text=auto !eol /LICENSE.txt -text -/Makefile -text +/Makefile.in -text include/memory_space.h -text include/nonce_relocs.h -text include/range.h -text @@ -10,7 +10,7 @@ include/zipr_all.h -text include/zipr_optimizations.h -text include/zipr_options.h -text include/zipr_stats.h -text -src/Makefile -text +src/Makefile.in -text src/main.cpp -text src/memory_space.cpp -text src/nonce_relocs.cpp -text diff --git a/Makefile b/Makefile.in similarity index 56% rename from Makefile rename to Makefile.in index c407c02..28c71b9 100644 --- a/Makefile +++ b/Makefile.in @@ -1,9 +1,13 @@ + + +bdir=@prefix@ + all: cd src;make install: all - cp src/zipr.exe bin + cp src/zipr.exe $(bdir)/bin clean: cd src;make clean diff --git a/src/Makefile b/src/Makefile.in similarity index 97% rename from src/Makefile rename to src/Makefile.in index 7882712..5d32614 100644 --- a/src/Makefile +++ b/src/Makefile.in @@ -8,7 +8,7 @@ OBJS=$(subst .cpp,.o, $(SRCS)) EXE=zipr.exe CXX=g++ -CXXFLAGS=$(INC) -g -DCGC +CXXFLAGS=$(INC) @OPTIMIZE@ LDFLAGS=-L$(SECURITY_TRANSFORMS_HOME)/lib LIBS=-lpqxx -lpq -lIRDB-core -lBeaEngine_s_d -ltransform ${SECURITY_TRANSFORMS_HOME}/tools/transforms/Rewrite_Utility.o -- GitLab