Skip to content

Commit

Permalink
v1.1.11: fix Makefile
Browse files Browse the repository at this point in the history
  • Loading branch information
landfillbaby committed Aug 20, 2023
1 parent bf64d49 commit 01d6d2e
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 11 deletions.
21 changes: 11 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -36,18 +36,12 @@ useld :=
endif
ifeq ($(OS),Windows_NT)
LDFLAGS ?= -s $(useld) -Wl,--as-needed,--gc-sections,--no-insert-timestamp
exestamp.c: pun.h
exestamp: exestamp.c
png2webp_timestamped: png2webp exestamp
./exestamp png2webp.exe $(shell git show -s --format=%ct)
png2webp_dynamic_timestamped: png2webp exestamp
./exestamp png2webp_dynamic.exe $(shell git show -s --format=%ct)
exestampexec = ./exestamp.exe
png2webp_timestamped: exestamp
png2webp_dynamic_timestamped: exestamp
else
LDFLAGS ?= -s $(useld) -Wl,--as-needed,--gc-sections
png2webp_timestamped: png2webp
./exestamp.py png2webp.exe $(shell git show -s --format=%ct)
png2webp_dynamic_timestamped: png2webp
./exestamp.py png2webp_dynamic.exe $(shell git show -s --format=%ct)
exestampexec = ./exestamp.py
endif
png2webp: CFLAGS += $(PTHREAD_CFLAGS)
png2webp png2webp_dynamic: \
Expand Down Expand Up @@ -171,6 +165,12 @@ png2webp_dynamic: png2webp.c
$(CC) $(CFLAGS) $(CPPFLAGS) -Lzlib -Llibpng/.libs -Llibwebp/src/.libs \
$(LDFLAGS) $(TARGET_ARCH) $< $(LOADLIBES) $(LDLIBS) -lpng -lwebp -o $@

exestamp: exestamp.c
png2webp_timestamped: png2webp
$(exestampexec) png2webp.exe $(shell git show -s --format=%ct)
png2webp_dynamic_timestamped: png2webp_dynamic
$(exestampexec) png2webp_dynamic.exe $(shell git show -s --format=%ct)

install: png2webp
$(INSTALL) $^ $(DESTDIR)$(PREFIX)/bin/
install_dynamic: png2webp_dynamic
Expand All @@ -182,6 +182,7 @@ clean:
cd libpng && $(MAKE) $(AM_MAKEFLAGS) clean
cd libwebp && $(MAKE) $(AM_MAKEFLAGS) clean

exestamp.c: pun.h
png2webp.c: p2wconf.h pun.h
libpng/png.c: libpng/config.h
libwebp/src/dsp/enc.c: libwebp/src/webp/config.h
Expand Down
2 changes: 1 addition & 1 deletion png2webp.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "p2wconf.h"
#endif
#ifndef VERSION
#define VERSION "v1.1.10"
#define VERSION "v1.1.11"
#endif
#define _FILE_OFFSET_BITS 64
#include "pun.h"
Expand Down

0 comments on commit 01d6d2e

Please sign in to comment.