You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
109 lines
3.6 KiB
109 lines
3.6 KiB
Index: Makefile |
|
--- Makefile.orig 2015-06-29 11:48:37.000000000 +0200 |
|
+++ Makefile 2016-03-27 14:59:46.147399246 +0200 |
|
@@ -81,7 +81,6 @@ |
|
|
|
#------------------------------------------------------------------------ |
|
#make install is validated only for Linux, OSX, kFreeBSD and Hurd targets |
|
-ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU)) |
|
|
|
install: |
|
@cd $(LZ4DIR); $(MAKE) -e install |
|
@@ -129,4 +128,3 @@ |
|
prg-travis: |
|
@cd $(PRGDIR); $(MAKE) -e test-travis |
|
|
|
-endif |
|
Index: lib/Makefile |
|
--- lib/Makefile.orig 2015-06-29 11:48:37.000000000 +0200 |
|
+++ lib/Makefile 2016-03-27 14:59:46.147399246 +0200 |
|
@@ -60,19 +60,13 @@ |
|
SHARED_EXT_VER = $(SHARED_EXT).$(LIBVER) |
|
endif |
|
|
|
-default: liblz4 |
|
+default: all |
|
|
|
-all: liblz4 |
|
+all: liblz4 liblz4.pc |
|
|
|
liblz4: lz4.c lz4hc.c lz4frame.c xxhash.c |
|
- @echo compiling static library |
|
- @$(CC) $(CPPFLAGS) $(CFLAGS) -c $^ |
|
- @$(AR) rcs liblz4.a lz4.o lz4hc.o lz4frame.o xxhash.o |
|
- @echo compiling dynamic library $(LIBVER) |
|
- @$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -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) |
|
+ $(CC) $(CPPFLAGS) $(CFLAGS) -c $^ |
|
+ $(AR) rcs liblz4.a lz4.o lz4hc.o lz4frame.o xxhash.o |
|
|
|
clean: |
|
@rm -f core *.o *.a *.$(SHARED_EXT) *.$(SHARED_EXT).* liblz4.pc |
|
@@ -81,7 +75,6 @@ |
|
|
|
#------------------------------------------------------------------------ |
|
#make install is validated only for Linux, OSX, kFreeBSD and Hurd targets |
|
-ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU)) |
|
|
|
liblz4.pc: liblz4.pc.in Makefile |
|
@echo creating pkgconfig |
|
@@ -91,11 +84,8 @@ |
|
-e 's|@VERSION@|$(VERSION)|' \ |
|
$< >$@ |
|
|
|
-install: liblz4 liblz4.pc |
|
+install: |
|
@install -d -m 755 $(DESTDIR)$(LIBDIR)/pkgconfig/ $(DESTDIR)$(INCLUDEDIR)/ |
|
- @install -m 755 liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/liblz4.$(SHARED_EXT_VER) |
|
- @cp -a liblz4.$(SHARED_EXT_MAJOR) $(DESTDIR)$(LIBDIR) |
|
- @cp -a liblz4.$(SHARED_EXT) $(DESTDIR)$(LIBDIR) |
|
@cp -a liblz4.pc $(DESTDIR)$(LIBDIR)/pkgconfig/ |
|
@install -m 644 liblz4.a $(DESTDIR)$(LIBDIR)/liblz4.a |
|
@install -m 644 lz4.h $(DESTDIR)$(INCLUDEDIR)/lz4.h |
|
@@ -114,4 +104,3 @@ |
|
@[ -f $(DESTDIR)$(INCLUDEDIR)/lz4frame.h ] && rm -f $(DESTDIR)$(INCLUDEDIR)/lz4frame.h |
|
@echo lz4 libraries successfully uninstalled |
|
|
|
-endif |
|
Index: programs/Makefile |
|
--- programs/Makefile.orig 2015-06-29 11:48:37.000000000 +0200 |
|
+++ programs/Makefile 2016-03-27 15:00:35.487812971 +0200 |
|
@@ -43,7 +43,7 @@ |
|
FLAGS := -I../lib $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) |
|
|
|
BINDIR := $(PREFIX)/bin |
|
-MANDIR := $(PREFIX)/share/man/man1 |
|
+MANDIR := $(PREFIX)/man/man1 |
|
LZ4DIR := ../lib |
|
|
|
|
|
@@ -68,9 +68,9 @@ |
|
|
|
m32: lz4c32 fullbench32 fuzzer32 frametest32 |
|
|
|
-bins: lz4 lz4c fullbench fuzzer frametest datagen |
|
+bins: lz4 lz4c |
|
|
|
-all: bins m32 |
|
+all: bins |
|
|
|
lz4: $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c $(LZ4DIR)/lz4frame.c $(LZ4DIR)/xxhash.c bench.c lz4io.c lz4cli.c |
|
$(CC) $(FLAGS) $^ -o $@$(EXT) |
|
@@ -114,9 +114,8 @@ |
|
|
|
#------------------------------------------------------------------------ |
|
#make install is validated only for Linux, OSX, kFreeBSD and Hurd targets |
|
-ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU)) |
|
|
|
-install: lz4 lz4c |
|
+install: |
|
@echo Installing binaries |
|
@install -d -m 755 $(DESTDIR)$(BINDIR)/ $(DESTDIR)$(MANDIR)/ |
|
@install -m 755 lz4 $(DESTDIR)$(BINDIR)/lz4 |
|
@@ -307,4 +306,3 @@ |
|
test-mem32: lz4c32 datagen |
|
# unfortunately, valgrind doesn't seem to work with non-native binary. If someone knows how to do a valgrind-test on a 32-bits exe with a 64-bits system... |
|
|
|
-endif
|
|
|