diff --git a/lib/Makefile b/lib/Makefile index 4fb8ed9..ec5436d 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -63,17 +63,17 @@ all: clean libzstd libzstd: $(ZSTD_FILES) @echo compiling static library - @$(CC) $(FLAGS) -c $^ - @$(AR) rcs $@.a *.o + $(CC) $(FLAGS) -c $^ + $(AR) rcs $@.a *.o @echo compiling dynamic library $(LIBVER) - @$(CC) $(FLAGS) -shared $^ -fPIC $(SONAME_FLAGS) -o $@.$(SHARED_EXT_VER) + $(CC) $(FLAGS) -shared $^ -fPIC $(SONAME_FLAGS) -o $@.$(SHARED_EXT_VER) @echo creating versioned links - @ln -sf $@.$(SHARED_EXT_VER) $@.$(SHARED_EXT_MAJOR) - @ln -sf $@.$(SHARED_EXT_VER) $@.$(SHARED_EXT) + ln -sf $@.$(SHARED_EXT_VER) $@.$(SHARED_EXT_MAJOR) + ln -sf $@.$(SHARED_EXT_VER) $@.$(SHARED_EXT) clean: - @rm -f core *.o *.a *.gcda *.$(SHARED_EXT) *.$(SHARED_EXT).* libzstd.pc - @rm -f decompress/*.o + rm -f core *.o *.a *.gcda *.$(SHARED_EXT) *.$(SHARED_EXT).* libzstd.pc + rm -f decompress/*.o @echo Cleaning library completed #------------------------------------------------------------------------ @@ -83,22 +83,22 @@ ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU FreeBSD DragonFly libzstd.pc: libzstd.pc: libzstd.pc.in @echo creating pkgconfig - @sed -e 's|@PREFIX@|$(PREFIX)|' \ + sed -e 's|@PREFIX@|$(PREFIX)|' \ -e 's|@LIBDIR@|$(LIBDIR)|' \ -e 's|@INCLUDEDIR@|$(INCLUDEDIR)|' \ -e 's|@VERSION@|$(VERSION)|' \ $< >$@ -install: libzstd libzstd.pc - @install -d -m 755 $(DESTDIR)$(LIBDIR)/pkgconfig/ $(DESTDIR)$(INCLUDEDIR)/ - @install -m 755 libzstd.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_VER) - @cp -a libzstd.$(SHARED_EXT_MAJOR) $(DESTDIR)$(LIBDIR) - @cp -a libzstd.$(SHARED_EXT) $(DESTDIR)$(LIBDIR) - @cp -a libzstd.pc $(DESTDIR)$(LIBDIR)/pkgconfig/ - @install -m 644 libzstd.a $(DESTDIR)$(LIBDIR)/libzstd.a - @install -m 644 zstd.h $(DESTDIR)$(INCLUDEDIR)/zstd.h - @install -m 644 common/zbuff.h $(DESTDIR)$(INCLUDEDIR)/zbuff.h - @install -m 644 dictBuilder/zdict.h $(DESTDIR)$(INCLUDEDIR)/zdict.h +install: libzstd.pc + install -d -m 755 $(DESTDIR)$(LIBDIR)/pkgconfig/ $(DESTDIR)$(INCLUDEDIR)/ + install -m 755 libzstd.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_VER) + cp -a libzstd.$(SHARED_EXT_MAJOR) $(DESTDIR)$(LIBDIR) + cp -a libzstd.$(SHARED_EXT) $(DESTDIR)$(LIBDIR) + cp -a libzstd.pc $(DESTDIR)$(LIBDIR)/pkgconfig/ + install -m 644 libzstd.a $(DESTDIR)$(LIBDIR)/libzstd.a + install -m 644 zstd.h $(DESTDIR)$(INCLUDEDIR)/zstd.h + install -m 644 common/zbuff.h $(DESTDIR)$(INCLUDEDIR)/zbuff.h + install -m 644 dictBuilder/zdict.h $(DESTDIR)$(INCLUDEDIR)/zdict.h @echo zstd static and shared library installed uninstall: diff --git a/programs/Makefile b/programs/Makefile index 6e78d0e..993d138 100644 --- a/programs/Makefile +++ b/programs/Makefile @@ -21,11 +21,7 @@ MANDIR = $(PREFIX)/share/man/man1 ZSTDDIR = ../lib -ifeq ($(shell $(CC) -v 2>&1 | grep -c "gcc version "), 1) -ALIGN_LOOP = -falign-loops=32 -else ALIGN_LOOP = -endif CPPFLAGS= -I$(ZSTDDIR) -I$(ZSTDDIR)/common -I$(ZSTDDIR)/dictBuilder CFLAGS ?= -O3