Skip to content

N
nx-libs
Commit 4bc550e8 authored by Mike Gabriel's avatar Mike Gabriel
Browse files
Options

nxcomp*,nxproxy: Add clean rules to Makefile.in templates.

parent 27ddd169
Hide whitespace changes
Inline Side-by-side
Showing with 115 additions and 261 deletions
debian/patches/012_nxcomp_makefile-uninstall+autoconf.full+lite.patch deleted 100644 → 0
View file @ 27ddd169
Description: Add install and uninstall stanzas to nxcomp/Makefile, honor ac dirs
Provide install and uninstall functionality in nxcomp/Makefile.
.
Honor autoconf's libdir (and includedir, while at it). This is a
must-have for multiarch platforms like x86_64 et al where multiple
forms of libraries can be installed at the same time.
Forwarded: pending...
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Author: Jan Engelhardt <jengelh@medozas.de>
Last-Update: 2012-02-14
--- a/nxcomp/Makefile.in
+++ b/nxcomp/Makefile.in
@@ -64,10 +64,15 @@
bindir = @bindir@
man1dir = @mandir@/man1
VPATH = @srcdir@
+libdir = @libdir@
+includedir = @includedir@
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
+INSTALL_LINK = cp -av
+DESTDIR =
+RM_FILE = rm -f
#
# This should be autodetected.
@@ -264,12 +269,44 @@
fi
touch depend.status
-install: install.bin install.man
+install: install.bin install.lib install.man
install.bin:
+install.lib: all
+ ./mkinstalldirs $(DESTDIR)${libdir}
+ ./mkinstalldirs $(DESTDIR)${includedir}/nx
+ $(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir}
+ $(INSTALL_LINK) libXcomp.so.3 $(DESTDIR)${libdir}
+ $(INSTALL_LINK) libXcomp.so $(DESTDIR)${libdir}
+ $(INSTALL_DATA) libXcomp.a $(DESTDIR)${libdir}
+ $(INSTALL_DATA) NX*.h $(DESTDIR)${includedir}/nx
+ $(INSTALL_DATA) MD5.h $(DESTDIR)${includedir}/nx
+ echo "Running ldconfig tool, this may take a while..." && ldconfig || true
+
install.man:
+uninstall: uninstall.bin uninstall.lib uninstall.man
+
+uninstall.bin:
+
+uninstall.lib:
+ $(RM_FILE) $(DESTDIR)${libdir}/$(LIBFULL)
+ $(RM_FILE) $(DESTDIR)${libdir}/libXcomp.so.3
+ $(RM_FILE) $(DESTDIR)${libdir}/libXcomp.so
+ $(RM_FILE) $(DESTDIR)${libdir}/libXcomp.a
+ $(RM_FILE) $(DESTDIR)${includedir}/nx/NXalert.h
+ $(RM_FILE) $(DESTDIR)${includedir}/nx/NX.h
+ $(RM_FILE) $(DESTDIR)${includedir}/nx/NXmitshm.h
+ $(RM_FILE) $(DESTDIR)${includedir}/nx/NXpack.h
+ $(RM_FILE) $(DESTDIR)${includedir}/nx/NXproto.h
+ $(RM_FILE) $(DESTDIR)${includedir}/nx/NXrender.h
+ $(RM_FILE) $(DESTDIR)${includedir}/nx/NXvars.h
+ $(RM_FILE) $(DESTDIR)${includedir}/nx/MD5.h
+ echo "Running ldconfig tool, this may take a while..." && ldconfig || true
+
+uninstall.man:
+
clean:
-rm -f *~ *.o *.bak *.orig *.rej st?????? core core.* *.out.* \
@ALL@
debian/patches/013_nxcompext_makefile-uninstall+autoconf.full.patch deleted 100644 → 0
View file @ 27ddd169
Description: Add install and uninstall stanzas to nxcompext/Makefile, honor autoconf dirs.
Provide install and uninstall functionality in nxcompext/Makefile.
.
Honor autoconf's libdir (and includedir, while at it). This is a
must-have for multiarch platforms like x86_64 et al where multiple
forms of libraries can be installed at the same time.
Forwarded: pending...
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Author: Jan Engelhardt <jengelh@medozas.de>
Last-Update: 2012-02-14
--- a/nxcompext/Makefile.in
+++ b/nxcompext/Makefile.in
@@ -56,11 +56,15 @@
bindir = @bindir@
man1dir = @mandir@/man1
VPATH = @srcdir@
+libdir = @libdir@
+includedir = @includedir@
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
-
+INSTALL_LINK = cp -av
+DESTDIR =
+RM_FILE = rm -f
#
# This should be autodetected.
#
@@ -147,12 +151,35 @@
fi
touch depend.status
-install: install.bin install.man
+install: install.bin install.lib install.man
install.bin:
+install.lib: all
+ ./mkinstalldirs $(DESTDIR)${libdir}
+ ./mkinstalldirs $(DESTDIR)${includedir}/nx
+ $(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir}
+ $(INSTALL_LINK) libXcompext.so.3 $(DESTDIR)${libdir}
+ $(INSTALL_LINK) libXcompext.so $(DESTDIR)${libdir}
+ $(INSTALL_DATA) NX*.h $(DESTDIR)${includedir}/nx
+ echo "Running ldconfig tool, this may take a while..." && ldconfig || true
+
install.man:
+uninstall: uninstall.bin uninstall.lib uninstall.man
+
+uninstall.bin:
+
+uninstall.lib:
+ $(RM_FILE) $(DESTDIR)${libdir}/$(LIBFULL)
+ $(RM_FILE) $(DESTDIR)${libdir}/libXcompext.so.3
+ $(RM_FILE) $(DESTDIR)${libdir}/libXcompext.so
+ $(RM_FILE) $(DESTDIR)${includedir}/nx/NXlib.h
+ $(RM_FILE) $(DESTDIR)${includedir}/nx/NXlibint.h
+ echo "Running ldconfig tool, this may take a while..." && ldconfig || true
+
+uninstall.man:
+
clean:
-rm -f *~ *.o *.bak *.orig *.rej st?????? core core.* *.out.* \
@ALL@
debian/patches/014_nxcompshad_makefile-uninstall+autoconf.full.patch deleted 100644 → 0
View file @ 27ddd169
Description: Add install and uninstall stanzas to nxcompshad/Makefile, honor autoconf dirs
Provide install and uninstall functionality in nxcompshad/Makefile.
.
Honor autoconf's libdir (and includedir, while at it). This is a
must-have for multiarch platforms like x86_64 et al where multiple
forms of libraries can be installed at the same time.
Forwarded: pending...
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Author: Jan Engelhardt <jengelh@medozas.de>
Last-Update: 2012-02-14
--- a/nxcompshad/Makefile.in
+++ b/nxcompshad/Makefile.in
@@ -74,10 +74,17 @@
bindir = @bindir@
man1dir = @mandir@/man1
VPATH = @srcdir@
+libdir = @libdir@
+includedir = @includedir@
INSTALL = @INSTALL@
+INSTALL_DIR = $(INSTALL) -d -o root -g root -m 0755
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
+INSTALL_LINK = cp -av
+DESTDIR =
+RM_FILE = rm -f
+RM_DIR = rmdir -p --ignore-fail-on-non-empty
#
# This should be autodetected.
@@ -178,12 +185,38 @@
fi
touch depend.status
-install: install.bin install.man
+install: install.bin install.lib install.man
install.bin:
+install.lib: all
+ $(INSTALL_DIR) $(DESTDIR)${libdir}
+ $(INSTALL_DIR) $(DESTDIR)${includedir}/nx
+ $(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir}
+ $(INSTALL_LINK) libXcompshad.so.3 $(DESTDIR)${libdir}
+ $(INSTALL_LINK) libXcompshad.so $(DESTDIR)${libdir}
+ $(INSTALL_DATA) *.a $(DESTDIR)${libdir}
+ $(INSTALL_DATA) *.h $(DESTDIR)${includedir}/nx
+ echo "Running ldconfig tool, this may take a while..." && ldconfig || true
+
install.man:
+uninstall: uninstall.bin uninstall.lib uninstall.man
+
+uninstall.bin:
+
+uninstall.lib:
+ $(RM_FILE) $(DESTDIR)${libdir}/$(LIBFULL)
+ $(RM_FILE) $(DESTDIR)${libdir}/libXcompshad.so.3
+ $(RM_FILE) $(DESTDIR)${libdir}/libXcompshad.so
+ $(RM_FILE) $(DESTDIR)${libdir}/libXcompshad.a
+ for header in *.h; do $(RM_FILE) $(DESTDIR)${includedir}/nx/$$header; done
+ $(RM_DIR) $(DESTDIR)${libdir}/nx/
+ $(RM_DIR) $(DESTDIR)${includedir}/nx/
+ echo "Running ldconfig tool, this may take a while..." && ldconfig || true
+
+uninstall.man:
+
clean:
-rm -f *~ *.o *.gch *.bak st?????? core core.* *.out.* *.exe.stackdump \
$(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE) $(LIBDLL) $(LIBDLLSTATIC) $(PROGRAM) $(PROGRAM).exe
debian/patches/015_nxproxy_makefile-uninstall.full+lite.patch deleted 100644 → 0
View file @ 27ddd169
Description: Add install and uninstall stanzas to nxcomp/Makefile
Provide install and uninstall functionality in nxcomp/Makefile.
Forwarded: pending...
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Last-Update: 2011-12-31
--- a/nxproxy/Makefile.in
+++ b/nxproxy/Makefile.in
@@ -41,6 +41,8 @@
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
+DESTDIR =
+RM_FILE = rm -f
#
# This should be autodetected.
@@ -87,11 +89,20 @@
install: install.bin install.man
install.bin: $(PROGRAM)
- $(srcdir)/mkinstalldirs $(bindir)
- $(INSTALL) $(PROGRAM) $(bindir)/$(PROGRAM)
+ $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
+ $(INSTALL_PROGRAM) $(PROGRAM) $(DESTDIR)$(bindir)/$(PROGRAM)
install.man:
- $(srcdir)/mkinstalldirs $(man1dir)
+ $(srcdir)/mkinstalldirs $(DESTDIR)$(man1dir)
+ $(INSTALL_DATA) man/$(PROGRAM).1 $(DESTDIR)$(man1dir)/$(PROGRAM).1
+
+uninstall: uninstall.bin uninstall.man
+
+uninstall.bin:
+ $(RM_FILE) $(DESTDIR)$(bindir)/$(PROGRAM)
+
+uninstall.man:
+ $(RM_FILE) $(DESTDIR)$(man1dir)/nxproxy.1
clean:
-rm -f *~ *.o *.bak st?????? core core.* *.out.* \
debian/patches/series
View file @ 4bc550e8
012_nxcomp_makefile-uninstall+autoconf.full+lite.patch
013_nxcompext_makefile-uninstall+autoconf.full.patch
014_nxcompshad_makefile-uninstall+autoconf.full.patch
015_nxproxy_makefile-uninstall.full+lite.patch
016_nx-X11_install-location.full.patch
024_fix-make-clean.full.patch
024_fix-make-clean.full+lite.patch
......
nxcomp/Makefile.in
View file @ 4bc550e8
......@@ -64,10 +64,15 @@ exec_prefix = @exec_prefix@
bindir = @bindir@
man1dir = @mandir@/man1
VPATH = @srcdir@
libdir = @libdir@
includedir = @includedir@
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LINK = cp -av
DESTDIR =
RM_FILE = rm -f
#
# This should be autodetected.
......@@ -264,12 +269,44 @@ depend.status:
fi
touch depend.status
install: install.bin install.man
install: install.bin install.lib install.man
install.bin:
install.lib: all
./mkinstalldirs $(DESTDIR)${libdir}
./mkinstalldirs $(DESTDIR)${includedir}/nx
$(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir}
$(INSTALL_LINK) libXcomp.so.3 $(DESTDIR)${libdir}
$(INSTALL_LINK) libXcomp.so $(DESTDIR)${libdir}
$(INSTALL_DATA) libXcomp.a $(DESTDIR)${libdir}
$(INSTALL_DATA) NX*.h $(DESTDIR)${includedir}/nx
$(INSTALL_DATA) MD5.h $(DESTDIR)${includedir}/nx
echo "Running ldconfig tool, this may take a while..." && ldconfig || true
install.man:
uninstall: uninstall.bin uninstall.lib uninstall.man
uninstall.bin:
uninstall.lib:
$(RM_FILE) $(DESTDIR)${libdir}/$(LIBFULL)
$(RM_FILE) $(DESTDIR)${libdir}/libXcomp.so.3
$(RM_FILE) $(DESTDIR)${libdir}/libXcomp.so
$(RM_FILE) $(DESTDIR)${libdir}/libXcomp.a
$(RM_FILE) $(DESTDIR)${includedir}/nx/NXalert.h
$(RM_FILE) $(DESTDIR)${includedir}/nx/NX.h
$(RM_FILE) $(DESTDIR)${includedir}/nx/NXmitshm.h
$(RM_FILE) $(DESTDIR)${includedir}/nx/NXpack.h
$(RM_FILE) $(DESTDIR)${includedir}/nx/NXproto.h
$(RM_FILE) $(DESTDIR)${includedir}/nx/NXrender.h
$(RM_FILE) $(DESTDIR)${includedir}/nx/NXvars.h
$(RM_FILE) $(DESTDIR)${includedir}/nx/MD5.h
echo "Running ldconfig tool, this may take a while..." && ldconfig || true
uninstall.man:
clean:
-rm -f *~ *.o *.bak *.orig *.rej st?????? core core.* *.out.* \
@ALL@
......
nxcompext/Makefile.in
View file @ 4bc550e8
......@@ -56,11 +56,15 @@ exec_prefix = @exec_prefix@
bindir = @bindir@
man1dir = @mandir@/man1
VPATH = @srcdir@
libdir = @libdir@
includedir = @includedir@
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LINK = cp -av
DESTDIR =
RM_FILE = rm -f
#
# This should be autodetected.
#
......@@ -147,12 +151,35 @@ depend.status:
fi
touch depend.status
install: install.bin install.man
install: install.bin install.lib install.man
install.bin:
install.lib: all
./mkinstalldirs $(DESTDIR)${libdir}
./mkinstalldirs $(DESTDIR)${includedir}/nx
$(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir}
$(INSTALL_LINK) libXcompext.so.3 $(DESTDIR)${libdir}
$(INSTALL_LINK) libXcompext.so $(DESTDIR)${libdir}
$(INSTALL_DATA) NX*.h $(DESTDIR)${includedir}/nx
echo "Running ldconfig tool, this may take a while..." && ldconfig || true
install.man:
uninstall: uninstall.bin uninstall.lib uninstall.man
uninstall.bin:
uninstall.lib:
$(RM_FILE) $(DESTDIR)${libdir}/$(LIBFULL)
$(RM_FILE) $(DESTDIR)${libdir}/libXcompext.so.3
$(RM_FILE) $(DESTDIR)${libdir}/libXcompext.so
$(RM_FILE) $(DESTDIR)${includedir}/nx/NXlib.h
$(RM_FILE) $(DESTDIR)${includedir}/nx/NXlibint.h
echo "Running ldconfig tool, this may take a while..." && ldconfig || true
uninstall.man:
clean:
-rm -f *~ *.o *.bak *.orig *.rej st?????? core core.* *.out.* \
@ALL@
......
nxcompshad/Makefile.in
View file @ 4bc550e8
......@@ -74,10 +74,17 @@ exec_prefix = @exec_prefix@
bindir = @bindir@
man1dir = @mandir@/man1
VPATH = @srcdir@
libdir = @libdir@
includedir = @includedir@
INSTALL = @INSTALL@
INSTALL_DIR = $(INSTALL) -d -o root -g root -m 0755
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LINK = cp -av
DESTDIR =
RM_FILE = rm -f
RM_DIR = rmdir -p --ignore-fail-on-non-empty
#
# This should be autodetected.
......@@ -178,12 +185,38 @@ depend.status:
fi
touch depend.status
install: install.bin install.man
install: install.bin install.lib install.man
install.bin:
install.lib: all
$(INSTALL_DIR) $(DESTDIR)${libdir}
$(INSTALL_DIR) $(DESTDIR)${includedir}/nx
$(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir}
$(INSTALL_LINK) libXcompshad.so.3 $(DESTDIR)${libdir}
$(INSTALL_LINK) libXcompshad.so $(DESTDIR)${libdir}
$(INSTALL_DATA) *.a $(DESTDIR)${libdir}
$(INSTALL_DATA) *.h $(DESTDIR)${includedir}/nx
echo "Running ldconfig tool, this may take a while..." && ldconfig || true
install.man:
uninstall: uninstall.bin uninstall.lib uninstall.man
uninstall.bin:
uninstall.lib:
$(RM_FILE) $(DESTDIR)${libdir}/$(LIBFULL)
$(RM_FILE) $(DESTDIR)${libdir}/libXcompshad.so.3
$(RM_FILE) $(DESTDIR)${libdir}/libXcompshad.so
$(RM_FILE) $(DESTDIR)${libdir}/libXcompshad.a
for header in *.h; do $(RM_FILE) $(DESTDIR)${includedir}/nx/$$header; done
$(RM_DIR) $(DESTDIR)${libdir}/nx/
$(RM_DIR) $(DESTDIR)${includedir}/nx/
echo "Running ldconfig tool, this may take a while..." && ldconfig || true
uninstall.man:
clean:
-rm -f *~ *.o *.gch *.bak st?????? core core.* *.out.* *.exe.stackdump \
$(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE) $(LIBDLL) $(LIBDLLSTATIC) $(PROGRAM) $(PROGRAM).exe
......
nxproxy/Makefile.in
View file @ 4bc550e8
......@@ -41,6 +41,8 @@ VPATH = @srcdir@
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
DESTDIR =
RM_FILE = rm -f
#
# This should be autodetected.
......@@ -87,11 +89,20 @@ depend.status:
install: install.bin install.man
install.bin: $(PROGRAM)
$(srcdir)/mkinstalldirs $(bindir)
$(INSTALL) $(PROGRAM) $(bindir)/$(PROGRAM)
$(srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
$(INSTALL_PROGRAM) $(PROGRAM) $(DESTDIR)$(bindir)/$(PROGRAM)
install.man:
$(srcdir)/mkinstalldirs $(man1dir)
$(srcdir)/mkinstalldirs $(DESTDIR)$(man1dir)
$(INSTALL_DATA) man/$(PROGRAM).1 $(DESTDIR)$(man1dir)/$(PROGRAM).1
uninstall: uninstall.bin uninstall.man
uninstall.bin:
$(RM_FILE) $(DESTDIR)$(bindir)/$(PROGRAM)
uninstall.man:
$(RM_FILE) $(DESTDIR)$(man1dir)/nxproxy.1
clean:
-rm -f *~ *.o *.bak st?????? core core.* *.out.* \
......
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