Changeset 84876aa4 in mainline for tools/xcw/demo/Makefile

Timestamp:

2019-11-15T13:46:34Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

ecb7828

Parents:

b093a62 (diff), d548fc0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge master into gfx

Mainly to get XCW fixes

File:

• tools/xcw/demo/Makefile (modified) (3 diffs)

tools/xcw/demo/Makefile

@@ -36 +36 @@
 #
 #    cd <helenos-source-dir>
-#    make distclean && make -j 4 PROFILE=amd64
-#    cd <helenos-source-dir>/tools/xcw/demo
-#    export PATH=$PATH:<helenos-source-dir>/tools/xcw/bin
+#    mkdir build
+#    cd build
+#    ../configure.sh
+#    ninja
+#    ../tools/export.sh export
+#    cd ../tools/xcw/demo
+#    export PATH=$PATH:<helenos-source-dir>/build/tools/xcw/bin
 #    make
 #
@@ -44 +48 @@
 CC = helenos-cc
 LD = helenos-ld
+INSTALL = install
+TEST = helenos-test
 CFLAGS = -std=gnu11 -Wall `helenos-pkg-config --cflags libgui libdraw libmath` \
     -D_HELENOS_SOURCE
 LIBS = `helenos-pkg-config --libs libgui libdraw libmath`
+PREFIX = `helenos-bld-config --install-dir`
 output = viewer
 objects = viewer.o
@@ -56 +63 @@
         rm -f $(output) $(objects)
 
+install: $(output)
+        mkdir -p $(PREFIX)/app
+        $(INSTALL) -T $(output) $(PREFIX)/app/$(output)-xcw
+
+uninstall:
+        rm -f $(PREFIX)/app/$(output)-xcw
+
+test: install
+        $(TEST)
+
 $(output): $(objects)
         $(CC) -o $@ $^ $(LIBS)