Merge pull request #81 from cawka/makefile-improvements

Makefile improvements
pull/65/head
Jeffrey Walton 2015-12-25 10:08:43 -05:00
commit bfce095d6b
1 changed files with 18 additions and 18 deletions

View File

@ -39,7 +39,7 @@ MACPORTS_COMPILER := $(shell $(CXX) --version 2>&1 | $(EGREP) -i -c "macports")
# Default prefix for make install # Default prefix for make install
ifeq ($(PREFIX),) ifeq ($(PREFIX),)
PREFIX = /usr PREFIX = /usr/local
endif endif
ifeq ($(CXX),gcc) # for some reason CXX is gcc on cygwin 1.1.4 ifeq ($(CXX),gcc) # for some reason CXX is gcc on cygwin 1.1.4
@ -361,31 +361,31 @@ endif
.PHONY: install .PHONY: install
install: install:
$(MKDIR) -p $(PREFIX)/include/cryptopp $(PREFIX)/lib $(PREFIX)/bin $(MKDIR) -p $(DESTDIR)$(PREFIX)/include/cryptopp $(DESTDIR)$(PREFIX)/lib $(DESTDIR)$(PREFIX)/bin
-$(CP) *.h $(PREFIX)/include/cryptopp -$(CP) *.h $(DESTDIR)$(PREFIX)/include/cryptopp
-$(CHMOD) 755 $(PREFIX)/include/cryptopp -$(CHMOD) 755 $(DESTDIR)$(PREFIX)/include/cryptopp
-$(CHMOD) 644 $(PREFIX)/include/cryptopp/*.h -$(CHMOD) 644 $(DESTDIR)$(PREFIX)/include/cryptopp/*.h
-$(CP) libcryptopp.a $(PREFIX)/lib -$(CP) libcryptopp.a $(DESTDIR)$(PREFIX)/lib
-$(CHMOD) 644 $(PREFIX)/lib/libcryptopp.a -$(CHMOD) 644 $(DESTDIR)$(PREFIX)/lib/libcryptopp.a
-$(CP) cryptest.exe $(PREFIX)/bin -$(CP) cryptest.exe $(DESTDIR)$(PREFIX)/bin
-$(CHMOD) 755 $(PREFIX)/bin/cryptest.exe -$(CHMOD) 755 $(DESTDIR)$(PREFIX)/bin/cryptest.exe
ifneq ($(IS_DARWIN),0) ifneq ($(IS_DARWIN),0)
-$(CP) libcryptopp.dylib $(PREFIX)/lib -$(CP) libcryptopp.dylib $(DESTDIR)$(PREFIX)/lib
-$(CHMOD) 755 $(PREFIX)/lib/libcryptopp.dylib -$(CHMOD) 755 $(DESTDIR)$(PREFIX)/lib/libcryptopp.dylib
else else
-$(CP) libcryptopp.so $(PREFIX)/lib -$(CP) libcryptopp.so $(DESTDIR)$(PREFIX)/lib
-$(CHMOD) 755 $(PREFIX)/lib/libcryptopp.so -$(CHMOD) 755 $(DESTDIR)$(PREFIX)/lib/libcryptopp.so
endif endif
.PHONY: remove uninstall .PHONY: remove uninstall
remove uninstall: remove uninstall:
-$(RM) -r $(PREFIX)/include/cryptopp -$(RM) -r $(DESTDIR)$(PREFIX)/include/cryptopp
-$(RM) $(PREFIX)/lib/libcryptopp.a -$(RM) $(DESTDIR)$(PREFIX)/lib/libcryptopp.a
-$(RM) $(PREFIX)/bin/cryptest.exe -$(RM) $(DESTDIR)$(PREFIX)/bin/cryptest.exe
ifneq ($(IS_DARWIN),0) ifneq ($(IS_DARWIN),0)
-$(RM) $(PREFIX)/lib/libcryptopp.dylib -$(RM) $(DESTDIR)$(PREFIX)/lib/libcryptopp.dylib
else else
-$(RM) $(PREFIX)/lib/libcryptopp.so -$(RM) $(DESTDIR)$(PREFIX)/lib/libcryptopp.so
endif endif
libcryptopp.a: public_service | $(LIBOBJS) libcryptopp.a: public_service | $(LIBOBJS)