diff options
-rw-r--r-- | programs/Makefile | 9 | ||||
-rw-r--r-- | tests/Makefile | 12 |
2 files changed, 8 insertions, 13 deletions
diff --git a/programs/Makefile b/programs/Makefile index 67af189..29408f1 100644 --- a/programs/Makefile +++ b/programs/Makefile @@ -42,7 +42,8 @@ LIBVER_PATCH := $(shell echo $(LIBVER_PATCH_SCRIPT)) LIBVER := $(shell echo $(LIBVER_SCRIPT)) SRCFILES := $(wildcard $(LZ4DIR)/*.c) $(wildcard *.c) -OBJFILES := $(patsubst %.c,%.o,$(SRCFILES)) +#OBJFILES := $(patsubst %.c,%.o,$(SRCFILES)) +OBJFILES := $(SRCFILES:.c=.o) CPPFLAGS += -I$(LZ4DIR) -DXXH_NAMESPACE=LZ4_ CFLAGS ?= -O3 @@ -81,13 +82,13 @@ lz4: $(OBJFILES) lz4-release: DEBUGFLAGS= lz4-release: lz4 +lz4c: lz4 + ln -s lz4 lz4c + lz4c32: CFLAGS += -m32 lz4c32 : $(SRCFILES) $(CC) $(FLAGS) $^ -o $@$(EXT) -lz4c: lz4 - ln -s lz4 lz4c - lz4.1: lz4.1.md cat $^ | $(MD2ROFF) $(MD2ROFF_FLAGS) | sed -n '/^\.\\\".*/!p' > $@ diff --git a/tests/Makefile b/tests/Makefile index fc4b143..bc13295 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -71,8 +71,8 @@ all32: all lz4: $(MAKE) -C $(PRGDIR) $@ CFLAGS="$(CFLAGS)" -lz4c: - $(MAKE) -C $(PRGDIR) $@ CFLAGS="$(CFLAGS)" +lz4c unlz4 lz4cat: lz4 + ln -sf $(LZ4) $(PRGDIR)/$@ lz4c32: # create a 32-bits version for 32/64 interop tests $(MAKE) -C $(PRGDIR) $@ CFLAGS="-m32 $(CFLAGS)" @@ -115,7 +115,7 @@ versionsTest: #----------------------------------------------------------------------------- -# make install is validated only for Linux, OSX, BSD, Hurd and Solaris targets +# validated only for Linux, OSX, BSD, Hurd and Solaris targets #----------------------------------------------------------------------------- ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS)) @@ -207,12 +207,6 @@ test-lz4-multiple: lz4 datagen $(LZ4) -f -m tmp-tlm1 notHere tmp-tlm2; echo $$? @$(RM) tmp-tlm* -unlz4: - @$(MAKE) -C $(PRGDIR) $@ CFLAGS="$(CFLAGS)" - -lz4cat: - @$(MAKE) -C $(PRGDIR) $@ CFLAGS="$(CFLAGS)" - test-lz4-basic: lz4 datagen unlz4 lz4cat @echo "\n ---- test lz4 basic compression/decompression ----" ./datagen -g0 | $(LZ4) -v | $(LZ4) -t |