diff options
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/Makefile b/Makefile index 1250439..1456f25 100644 --- a/Makefile +++ b/Makefile @@ -10,9 +10,8 @@ SRCDIR = $(PREFIX)/src HARESRCDIR = $(SRCDIR)/hare THIRDPARTYDIR = $(HARESRCDIR)/third-party -BINDINGS_DIR = bindings MODULES_CORE = \ - types/libc \ + gi/libc \ gi/glib \ gi/gobject \ gi/gio \ @@ -57,14 +56,14 @@ install-gtk3: .gen @for mod in $(MODULES_GTK3); do \ printf "installing %s\n" "$$mod"; \ mkdir -p "$(DESTDIR)$(THIRDPARTYDIR)/$$mod"; \ - install -m644 "$(BINDINGS_DIR)/$$mod"/* "$(DESTDIR)$(THIRDPARTYDIR)/$$mod"; \ + install -m644 "$$mod"/* "$(DESTDIR)$(THIRDPARTYDIR)/$$mod"; \ done install-gtk4: .gen @for mod in $(MODULES_GTK4); do \ printf "installing %s\n" "$$mod"; \ mkdir -p "$(DESTDIR)$(THIRDPARTYDIR)/$$mod"; \ - install -m644 "$(BINDINGS_DIR)/$$mod"/* "$(DESTDIR)$(THIRDPARTYDIR)/$$mod"; \ + install -m644 "$$mod"/* "$(DESTDIR)$(THIRDPARTYDIR)/$$mod"; \ done uninstall: uninstall3 uninstall4 @@ -81,25 +80,14 @@ uninstall4: rm -r "$(DESTDIR)$(THIRDPARTYDIR)/$$mod"; \ done -HAREPATH_ENV_CMD = hare version -vv | grep '^HAREPATH' +demo3: .gen + hare build $(LIBS_3) -o demo3 cmd/demo3 -# hare version -vv returns the value of HAREPATH in form -# HAREPATH=<possibly shell-quoted string> -# -# Using eval on that line will set the HAREPATH variable in the environment to -# the unquoted value, which makes it easy to add the bindings directory to the -# path - -demo3: - eval "$$($(HAREPATH_ENV_CMD))" && env HAREPATH="$(BINDINGS_DIR):$$HAREPATH" \ - hare build $(LIBS_3) -o demo3 cmd/demo3 - -demo4: - eval "$$($(HAREPATH_ENV_CMD))" && env HAREPATH="$(BINDINGS_DIR):$$HAREPATH" \ - hare build $(LIBS_4) -o demo4 cmd/demo4 +demo4: .gen + hare build $(LIBS_4) -o demo4 cmd/demo4 clean: - rm -f hare-gi xmltree demo3 demo4 bindings/gi/*/_generate.ha + rm -f hare-gi xmltree demo3 demo4 gi/*/_generate.ha .PHONY: all clean .PHONY: install install-gtk3 install-gtk4 |