diff options
| -rw-r--r-- | Makefile | 11 | ||||
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | programs/Makefile | 4 |
3 files changed, 11 insertions, 7 deletions
@@ -30,7 +30,7 @@ # - LZ4 forum froup : https://groups.google.com/forum/#!forum/lz4c # ################################################################ -RELEASE=r111 +RELEASE=r112 DESTDIR= PREFIX=/usr CC=gcc @@ -61,6 +61,7 @@ SOURCES = $(TEXT) $(NONTEXT) default: liblz4 + @cd $(PRGDIR); make all: liblz4 lz4programs @@ -73,8 +74,8 @@ liblz4.a: lz4.c lz4hc.c $(CC) -O3 -c $(CFLAGS) $^ ar rcs liblz4.a lz4.o lz4hc.o -liblz4.so: lz4.c lz4hc.c lz4.h - $(CC) -shared -fPIC -Wl,--soname=liblz4.so.1 $(CFLAGS) -o $@ +liblz4.so: lz4.c lz4hc.c + $(CC) -shared -fPIC -Wl,--soname=liblz4.so.1 $(CFLAGS) $^ -o $@ clean: @rm -f core *.o *.a *.so $(DISTRIBNAME) @@ -97,8 +98,8 @@ install: liblz4 uninstall: [ -x $(DESTDIR)$(LIBDIR)/liblz4.a ] && rm -f $(DESTDIR)$(LIBDIR)/liblz4.a [ -x $(DESTDIR)$(LIBDIR)/liblz4.so ] && rm -f $(DESTDIR)$(LIBDIR)/liblz4.so - [ -f $(DESTDIR)$(INCLUDEDIR)/lz4.h ] && rm -f lz4.h $(DESTDIR)$(INCLUDEDIR)/lz4.h - [ -f $(DESTDIR)$(INCLUDEDIR)/lz4hc.h ] && rm -f lz4.h $(DESTDIR)$(INCLUDEDIR)/lz4hc.h + [ -f $(DESTDIR)$(INCLUDEDIR)/lz4.h ] && rm -f $(DESTDIR)$(INCLUDEDIR)/lz4.h + [ -f $(DESTDIR)$(INCLUDEDIR)/lz4hc.h ] && rm -f $(DESTDIR)$(INCLUDEDIR)/lz4hc.h @echo lz4 libraries successfully uninstalled @cd $(PRGDIR); make uninstall @@ -1,3 +1,6 @@ +r112: +quickfix + r111 : Makefile : added capability to install libraries Modified Directory tree, to better separate libraries from programs. diff --git a/programs/Makefile b/programs/Makefile index 2bc2902..5f86d3c 100644 --- a/programs/Makefile +++ b/programs/Makefile @@ -30,11 +30,11 @@ # fullbench32: Same as fullbench, but forced to compile in 32-bits mode # ################################################################ -RELEASE=r111 +RELEASE=r112 DESTDIR= PREFIX=/usr CC=gcc -CFLAGS+= -I. -std=c99 -Wall -W -Wundef -DLZ4_VERSION=\"$(RELEASE)\" +CFLAGS+= -I.. -std=c99 -Wall -W -Wundef -DLZ4_VERSION=\"$(RELEASE)\" BINDIR=$(PREFIX)/bin MANDIR=$(PREFIX)/share/man/man1 |