aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-10-30 14:32:04 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-10-30 14:32:04 +0100
commit23c66f400e52f9f98213fdd88cd77072c05c3e63 (patch)
treeb14d970e97ebd7bc65858f11cd6b111f1241c0a5
parent23ad270b5bfff3d5bf208dbb63a4656c4a5cf9f7 (diff)
parent1ddbe39ade8abfaf028c2f7a87121954fdfaff0f (diff)
downloadnx-libs-23c66f400e52f9f98213fdd88cd77072c05c3e63.tar.gz
nx-libs-23c66f400e52f9f98213fdd88cd77072c05c3e63.tar.bz2
nx-libs-23c66f400e52f9f98213fdd88cd77072c05c3e63.zip
Merge branch 'sunweaver-pr/drop-nxlibint-h' into 3.6.x
Attributes GH PR #258: https://github.com/ArcticaProject/nx-libs/pull/258
-rw-r--r--debian/libxcompext-dev.install3
-rw-r--r--nx-X11/programs/Xserver/Imakefile3
-rw-r--r--nx-libs.spec1
-rw-r--r--nxcompext/Makefile.in1
-rw-r--r--nxcompext/NXlibint.h39
5 files changed, 2 insertions, 45 deletions
diff --git a/debian/libxcompext-dev.install b/debian/libxcompext-dev.install
index a31961b99..52f22918d 100644
--- a/debian/libxcompext-dev.install
+++ b/debian/libxcompext-dev.install
@@ -1,4 +1,3 @@
usr/lib/*/libXcompext.so
usr/include/*/nx/NXlib.h
-usr/include/*/nx/NXlibint.h
-usr/lib/*/pkgconfig/nxcompext.pc \ No newline at end of file
+usr/lib/*/pkgconfig/nxcompext.pc
diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile
index f633c94b3..c98e746cb 100644
--- a/nx-X11/programs/Xserver/Imakefile
+++ b/nx-X11/programs/Xserver/Imakefile
@@ -336,8 +336,7 @@ NX_XCOMP_HEADERS = \
../../../nxcomp/NXvars.h
NX_XCOMPEXT_HEADERS = \
- ../../../nxcompext/NXlib.h \
- ../../../nxcompext/NXlibint.h
+ ../../../nxcompext/NXlib.h
NX_XCOMPSHAD_HEADERS = \
../../../nxcompshad/Shadow.h
diff --git a/nx-libs.spec b/nx-libs.spec
index 1c6523116..661201dff 100644
--- a/nx-libs.spec
+++ b/nx-libs.spec
@@ -488,7 +488,6 @@ rm -r %{buildroot}%{_includedir}/nx-X11/Xtrans
%defattr(-,root,root)
%_libdir/libXcompext.so
%{_includedir}/nx/NXlib.h
-%{_includedir}/nx/NXlibint.h
%{_libdir}/pkgconfig/nxcompext.pc
%files -n libXcompext3
diff --git a/nxcompext/Makefile.in b/nxcompext/Makefile.in
index 5e0e15015..e2f1852f9 100644
--- a/nxcompext/Makefile.in
+++ b/nxcompext/Makefile.in
@@ -200,7 +200,6 @@ uninstall.lib:
$(RM_FILE) $(DESTDIR)${libdir}/$(LIBLOAD)
$(RM_FILE) $(DESTDIR)${libdir}/$(LIBSHARED)
$(RM_FILE) $(DESTDIR)${includedir}/nx/NXlib.h
- $(RM_FILE) $(DESTDIR)${includedir}/nx/NXlibint.h
$(RM_FILE) $(DESTDIR)${pkgconfigdir}/nxcompext.pc
echo "Running ldconfig tool, this may take a while..." && ldconfig || true
diff --git a/nxcompext/NXlibint.h b/nxcompext/NXlibint.h
deleted file mode 100644
index e5caf8f45..000000000
--- a/nxcompext/NXlibint.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/**************************************************************************/
-/* */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com) */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de> */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de> */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com) */
-/* */
-/* NXCOMPEXT, NX protocol compression and NX extensions to this software */
-/* are copyright of the aforementioned persons and companies. */
-/* */
-/* Redistribution and use of the present software is allowed according */
-/* to terms specified in the file LICENSE which comes in the source */
-/* distribution. */
-/* */
-/* All rights reserved. */
-/* */
-/* NOTE: This software has received contributions from various other */
-/* contributors, only the core maintainers and supporters are listed as */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well. */
-/* */
-/**************************************************************************/
-
-#ifndef NXlibint_H
-#define NXlibint_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "NXvars.h"
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* NXlibint_H */