aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2019-03-01 13:50:31 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2019-03-01 15:20:18 +0100
commit6812657f04d0e9a1e2fe92c0180f482a693df9ec (patch)
tree35c4c49e717b6ea72b20b2a902475027e3a9e6a3
parent57ca69fe09285ed7572d86f94e257484caa015a2 (diff)
downloadnx-libs-6812657f04d0e9a1e2fe92c0180f482a693df9ec.tar.gz
nx-libs-6812657f04d0e9a1e2fe92c0180f482a693df9ec.tar.bz2
nx-libs-6812657f04d0e9a1e2fe92c0180f482a693df9ec.zip
Makefile: Integrate new subproject "nxdialog".
-rw-r--r--Makefile8
1 files changed, 8 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 2fa75d3fc..0657bcb7d 100644
--- a/Makefile
+++ b/Makefile
@@ -170,6 +170,9 @@ build-full: build-env
# build nxproxy fifth
cd nxproxy && autoreconf -vfsi && (${CONFIGURE}) && ${MAKE}
+ # "build" nxdialog last
+ cd nxdialog && autoreconf -vfsi && (${CONFIGURE}) && ${MAKE}
+
build:
if ! test -d nx-X11; then \
${MAKE} build-lite; \
@@ -247,6 +250,9 @@ install-full:
$(MAKE) -C nx-X11/lib install
+ # install the nxdialog executable and its man page
+ $(MAKE) -C nxdialog install
+
uninstall:
$(MAKE) uninstall-lite
[ ! -d nx-X11 ] || $(MAKE) uninstall-full
@@ -269,3 +275,5 @@ uninstall-full:
$(RM_DIR_REC) $(DESTDIR)$(NXLIBDIR)
$(RM_DIR_REC) $(DESTDIR)$(INCLUDEDIR)/nx
+
+ test -f nxdialog/Makefile && ${MAKE} -C nxdialog "$@"