$NetBSD: patch-thirdparty_mujs_Makefile,v 1.8 2021/10/23 15:22:07 leot Exp $ - Add libtool support to mujs. - Avoid to set (unused) VERSION variable. --- thirdparty/mujs/Makefile.orig 2021-06-08 11:41:51.000000000 +0000 +++ thirdparty/mujs/Makefile @@ -9,12 +9,6 @@ bindir ?= $(prefix)/bin incdir ?= $(prefix)/include libdir ?= $(prefix)/lib -ifeq "$(wildcard .git)" ".git" - VERSION := $(shell git describe --tags --always) -else - VERSION := $(shell basename $$PWD | sed -e s,^mujs-,,) -endif - # Compiler flags for various configurations: CFLAGS := -std=c99 -pedantic -Wall -Wextra -Wno-unused-parameter @@ -54,7 +48,7 @@ HDRS := $(wildcard js*.h mujs.h utf.h re default: shell shell: $(OUT)/mujs $(OUT)/mujs-pp -static: $(OUT)/libmujs.a +static: $(OUT)/libmujs.la shared: $(OUT)/libmujs.so astnames.h: jsparse.h @@ -68,15 +62,15 @@ one.c: $(SRCS) jsdump.c: astnames.h opnames.h -$(OUT)/%.o: %.c $(HDRS) +$(OUT)/%.lo: %.c $(HDRS) @ mkdir -p $(dir $@) $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $< -$(OUT)/libmujs.o: one.c $(HDRS) +$(OUT)/libmujs.lo: one.c $(HDRS) @ mkdir -p $(dir $@) $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $< -$(OUT)/libmujs.a: $(OUT)/libmujs.o +$(OUT)/libmujs.la: $(OUT)/libmujs.lo @ mkdir -p $(dir $@) $(AR) cr $@ $^ @@ -84,11 +78,11 @@ $(OUT)/libmujs.so: one.c $(HDRS) @ mkdir -p $(dir $@) $(CC) $(CFLAGS) $(CPPFLAGS) -fPIC -shared $(LDFLAGS) -o $@ $< -lm -$(OUT)/mujs: $(OUT)/libmujs.o $(OUT)/main.o +$(OUT)/mujs: $(OUT)/libmujs.lo $(OUT)/main.lo @ mkdir -p $(dir $@) $(CC) $(LDFLAGS) -o $@ $^ $(LIBREADLINE) -lm -$(OUT)/mujs-pp: $(OUT)/libmujs.o $(OUT)/pp.o +$(OUT)/mujs-pp: $(OUT)/libmujs.lo $(OUT)/pp.lo @ mkdir -p $(dir $@) $(CC) $(LDFLAGS) -o $@ $^ -lm @@ -114,8 +108,8 @@ install-common: $(OUT)/mujs $(OUT)/mujs. install -m 644 $(OUT)/mujs.pc $(DESTDIR)$(libdir)/pkgconfig install -m 755 $(OUT)/mujs $(DESTDIR)$(bindir) -install-static: install-common $(OUT)/libmujs.a - install -m 644 $(OUT)/libmujs.a $(DESTDIR)$(libdir) +install-static: install-common $(OUT)/libmujs.la + ${LIBTOOL} --mode=install $(OUT)/libmujs.la $(DESTDIR)$(libdir) install-shared: install-common $(OUT)/libmujs.so install -m 755 $(OUT)/libmujs.so $(DESTDIR)$(libdir)