diff options
| author | Holger Cremer <HolgerCremer@gmail.com> | 2018-08-27 19:38:11 +0200 |
|---|---|---|
| committer | Holger Cremer <HolgerCremer@gmail.com> | 2018-08-27 19:38:11 +0200 |
| commit | 8f2ba2050ee78d0e4a47f1277c6bc4422d06170c (patch) | |
| tree | c008d2878905e03df7a8bf8bd3330762cc2d8f43 /Makefile | |
| parent | bb55e121576a5b5d225bfc68c5062f386cc32db9 (diff) | |
| parent | 3fc3ea6c6df237dbdf48d14703118b747bf5d647 (diff) | |
| download | serial-barcode-scanner-8f2ba2050ee78d0e4a47f1277c6bc4422d06170c.tar.bz2 | |
Merge branch 'master' into better_inventory
Conflicts:
README
data/templates/products/entry.html
docker/Dockerfile
docker/init.sh
src/database/database.vala
src/database/db-interface.vala
src/pdf-stock/Makefile
src/pdf-stock/pdf-stock-interface.vala
src/pdf-stock/pdf-stock.vala
src/web/Makefile
src/web/main.vala
templates/menu.html
templates/products/index.html
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 24 |
1 files changed, 16 insertions, 8 deletions
@@ -1,12 +1,20 @@ -all: - @cd src && make --no-print-directory all +all: compile gettext -clean: - @cd src && make --no-print-directory clean +build: + meson build + +compile: build + cd build && ninja + +gettext: build + cd build && ninja shopsystem-pot + cd build && ninja shopsystem-update-po -install: - @cd src && make --no-print-directory install - @cd dbus && make --no-print-directory install +install: build + cd build && DESTDIR=`pwd`/tmpinst ninja install + +clean: + rm -rf build shop.db: sql/tables.sql sql/views.sql sql/trigger.sql @for file in $^ ; do \ @@ -14,4 +22,4 @@ shop.db: sql/tables.sql sql/views.sql sql/trigger.sql sqlite3 shop.db < $$file; \ done -.PHONY: all clean install +.PHONY: all clean install gettext |