Skip to content

N
nx-libs
Commit a93f64e4 authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mike Gabriel
Browse files
Options

Makefile: use test + && instead of if test/else/fi

parent 58615f9f
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 16 deletions
Makefile
View file @ a93f64e4
...@@ -62,19 +62,19 @@ NX_XTRANS_HEADERS = \ ...@@ -62,19 +62,19 @@ NX_XTRANS_HEADERS = \
all: build all: build
clean: clean:
if test -f nxcomp/Makefile; then ${MAKE} -C nxcomp clean; fi test -f nxcomp/Makefile && ${MAKE} -C nxcomp clean
if test -f nxproxy/Makefile; then ${MAKE} -C nxproxy clean; fi test -f nxproxy/Makefile && ${MAKE} -C nxproxy clean
if test -f nx-X11/lib/Makefile; then ${MAKE} -C nx-X11/lib clean; fi test -f nx-X11/lib/Makefile && ${MAKE} -C nx-X11/lib clean
if test -f nxcompshad/Makefile; then ${MAKE} -C nxcompshad clean; fi test -f nxcompshad/Makefile && ${MAKE} -C nxcompshad clean
if test -d nx-X11; then ${MAKE} clean-env; fi test -d nx-X11 && ${MAKE} clean-env
distclean: clean distclean: clean
if test -f nxcomp/Makefile; then ${MAKE} -C nxcomp distclean; fi test -f nxcomp/Makefile && ${MAKE} -C nxcomp distclean
if test -f nxproxy/Makefile; then ${MAKE} -C nxproxy distclean; fi test -f nxproxy/Makefile && ${MAKE} -C nxproxy distclean
if test -f nx-X11/lib/Makefile; then ${MAKE} -C nx-X11/lib distclean; fi test -f nx-X11/lib/Makefile && ${MAKE} -C nx-X11/lib distclean
if test -f nxcompshad/Makefile; then ${MAKE} -C nxcompshad distclean; fi test -f nxcompshad/Makefile && ${MAKE} -C nxcompshad distclean
if test -d nx-X11; then ${MAKE} -C nx-X11 distclean; fi test -d nx-X11 && ${MAKE} -C nx-X11 distclean
if [ -x ./mesa-quilt ]; then ./mesa-quilt pop -a; fi test -x ./mesa-quilt && ./mesa-quilt pop -a
$(RM_DIR_REC) nx-X11/extras/Mesa/.pc/ $(RM_DIR_REC) nx-X11/extras/Mesa/.pc/
$(RM_FILE) nx-X11/config/cf/nxversion.def $(RM_FILE) nx-X11/config/cf/nxversion.def
$(RM_FILE) nx-X11/config/cf/nxconfig.def $(RM_FILE) nx-X11/config/cf/nxconfig.def
...@@ -140,7 +140,7 @@ clean-env: version ...@@ -140,7 +140,7 @@ clean-env: version
${MAKE} -j1 -C nx-X11 clean IMAKE_DEFINES="$(IMAKE_DEFINES)" ${MAKE} -j1 -C nx-X11 clean IMAKE_DEFINES="$(IMAKE_DEFINES)"
build-lite: build-lite:
cd nxcomp && autoreconf -vfsi && (${CONFIGURE}) && ${MAKE} cd nxcomp && autoreconf -vfsi && (${CONFIGURE}) && ${MAKE}
cd nxproxy && autoreconf -vfsi && (${CONFIGURE}) && ${MAKE} cd nxproxy && autoreconf -vfsi && (${CONFIGURE}) && ${MAKE}
build-full: build-env build-full: build-env
...@@ -249,15 +249,15 @@ uninstall: ...@@ -249,15 +249,15 @@ uninstall:
[ ! -d nx-X11 ] || $(MAKE) uninstall-full [ ! -d nx-X11 ] || $(MAKE) uninstall-full
uninstall-lite: uninstall-lite:
if test -f nxcomp/Makefile; then ${MAKE} -C nxcomp "$@"; fi test -f nxcomp/Makefile && ${MAKE} -C nxcomp "$@"
if test -f nxproxy/Makefile; then ${MAKE} -C nxproxy "$@"; fi test -f nxproxy/Makefile && ${MAKE} -C nxproxy "$@"
$(RM_FILE) $(DESTDIR)$(PREFIX)/share/nx/VERSION.nxproxy $(RM_FILE) $(DESTDIR)$(PREFIX)/share/nx/VERSION.nxproxy
$(RM_DIR) $(DESTDIR)$(PREFIX)/share/nx/ $(RM_DIR) $(DESTDIR)$(PREFIX)/share/nx/
uninstall-full: uninstall-full:
if test -f nxcompshad/Makefile; then ${MAKE} -C nxcompshad "$@"; fi test -f nxcompshad/Makefile && ${MAKE} -C nxcompshad "$@"
if test -f nx-X11/lib/Makefile; then ${MAKE} -C nx-X11/lib "$@"; fi test -f nx-X11/lib/Makefile && ${MAKE} -C nx-X11/lib "$@"
$(RM_FILE) $(DESTDIR)$(BINDIR)/nxagent $(RM_FILE) $(DESTDIR)$(BINDIR)/nxagent
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment