diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-11-03 00:19:26 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-11-15 16:38:26 +0100 |
| commit | 80b5de3f55fd493ee85f2a78b731ff05e6363e43 (patch) | |
| tree | 29930f1da570f462521557ee426a96d53eef1e2c /Makefile | |
| parent | cae394b45f499817ef5caa9876a8e40db6484b83 (diff) | |
| download | nx-libs-80b5de3f55fd493ee85f2a78b731ff05e6363e43.tar.gz nx-libs-80b5de3f55fd493ee85f2a78b731ff05e6363e43.tar.bz2 nx-libs-80b5de3f55fd493ee85f2a78b731ff05e6363e43.zip | |
nxcompext: Move code into Xserver subtree, as nxcompext requires Xserver includes at build time.
Fixes ArcticaProject/nx-libs#276.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 1 insertions, 5 deletions
@@ -29,7 +29,6 @@ SHELL:=/bin/bash if test -f nxcomp/Makefile; then ${MAKE} -C nxcomp $@; fi if test -f nxproxy/Makefile; then ${MAKE} -C nxproxy $@; fi if test -d nx-X11; then \ - if test -f nxcompext/Makefile; then ${MAKE} -C nxcompext $@; fi; \ if test -f nxcompshad/Makefile; then ${MAKE} -C nxcompshad $@; fi; \ if test -f nx-X11/Makefile; then ${MAKE} -C nx-X11 $@; fi; \ fi @@ -70,7 +69,6 @@ build-full: # nxcomp{ext,shad}. cd nx-X11/lib && make - cd nxcompext && autoconf && (${CONFIGURE}) && ${MAKE} cd nxcompshad && autoconf && (${CONFIGURE}) && ${MAKE} cd nx-X11 && ${MAKE} World @@ -112,8 +110,7 @@ install-full: sed -e 's|@@NXLIBDIR@@|$(NXLIBDIR)|g' bin/nxagent.in > bin/nxagent $(INSTALL_PROGRAM) bin/nxagent $(DESTDIR)$(BINDIR) - for d in nxcompext nxcompshad; do \ - $(MAKE) -C $$d install; done + $(MAKE) -C nxcompshad install $(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/pixmaps $(INSTALL_FILE) nx-X11/programs/Xserver/hw/nxagent/nxagent.xpm $(DESTDIR)$(PREFIX)/share/pixmaps @@ -198,7 +195,6 @@ uninstall-full: $(RM_DIR) $(DESTDIR)$(NXLIBDIR)/share/nx/ if test -d nx-X11; then \ - if test -f nxcompext/Makefile; then ${MAKE} -C nxcompext $@; fi; \ if test -f nxcompshad/Makefile; then ${MAKE} -C nxcompshad $@; fi; \ if test -f nx-X11/Makefile; then \ if test -d $(NXLIBDIR); then rm -rf $(NXLIBDIR); fi; \ |