diff options
| author | Drew DeVault <drew@ddevault.org> | 2025-03-21 10:40:01 +0100 |
|---|---|---|
| committer | Alexey Yerin <yyp@disroot.org> | 2025-03-21 14:18:01 +0300 |
| commit | 1e85675b652b4e133a98841d75bb7fe7e00058d5 (patch) | |
| tree | 54585b454add3aaa3ffe96d6f3e109b46c4563a8 | |
| parent | 98fc3cf2108790200aa12635bc46e3cb3cb0139a (diff) | |
Add consistent "3" suffix to gtk3 bits
Signed-off-by: Drew DeVault <drew@ddevault.org>
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Makefile | 16 | ||||
| -rw-r--r-- | cmd/demo3/main.ha (renamed from cmd/demo/main.ha) | 0 | ||||
| -rwxr-xr-x | generate3 (renamed from generate) | 0 |
4 files changed, 11 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore index 4d33af7..28c2fe4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ /xmltree /hare-gi -/demo +/demo3 /demo4 _generated.ha diff --git a/Makefile b/Makefile index 84d83cc..9e73e1c 100644 --- a/Makefile +++ b/Makefile @@ -38,7 +38,9 @@ hare-gi: hare build -o $@ cmd/hare-gi/ .PHONY: hare-gi -install: +install: install3 install4 + +install3: @for mod in $(MODULES_GTK3); do \ printf "installing %s\n" "$$mod"; \ mkdir -p "$(DESTDIR)$(THIRDPARTYDIR)/$$mod"; \ @@ -52,7 +54,9 @@ install4: install -m644 "$(BINDINGS_DIR)/$$mod"/* "$(DESTDIR)$(THIRDPARTYDIR)/$$mod"; \ done -uninstall: +uninstall: uninstall3 uninstall4 + +uninstall3: @for mod in $(MODULES_GTK3); do \ printf "uninstalling %s\n" "$$mod"; \ rm -r "$(DESTDIR)$(THIRDPARTYDIR)/$$mod"; \ @@ -73,15 +77,15 @@ HAREPATH_ENV_CMD = hare version -vv | grep '^HAREPATH' # the unquoted value, which makes it easy to add the bindings directory to the # path -demo: +demo3: eval "$$($(HAREPATH_ENV_CMD))" && env HAREPATH="$(BINDINGS_DIR):$$HAREPATH" \ - hare build $$(pkg-config --libs-only-l gtk+-3.0) -o demo cmd/demo + hare build $$(pkg-config --libs-only-l gtk+-3.0) -o demo3 cmd/demo3 demo4: eval "$$($(HAREPATH_ENV_CMD))" && env HAREPATH="$(BINDINGS_DIR):$$HAREPATH" \ hare build $$(pkg-config --libs-only-l gtk4) -o demo4 cmd/demo4 clean: - rm -f hare-gi xmltree demo demo4 + rm -f hare-gi xmltree demo3 demo4 bindings/gi/*/_generate.ha -.PHONY: all install install4 uninstall uninstall4 demo demo4 clean +.PHONY: all install3 install4 uninstall3 uninstall4 demo3 demo4 clean diff --git a/cmd/demo/main.ha b/cmd/demo3/main.ha index a106b5c..a106b5c 100644 --- a/cmd/demo/main.ha +++ b/cmd/demo3/main.ha diff --git a/generate b/generate3 index 3b17734..3b17734 100755 --- a/generate +++ b/generate3 |