Merge branch 'sunweaver-pr/nxcompshad-autoreconf' into 3.6.x

Attributes GH PR #474: https://github.com/ArcticaProject/nx-libs/pull/474

3 files changed, 27 insertions, 26 deletions

diff --git a/debian/copyright b/debian/copyright
index b08ec0335..d9ef896b0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -80,25 +80,25 @@ Files: nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h
  nx-X11/programs/Xserver/hw/nxagent/compext/Rle.h
  nx-X11/programs/Xserver/hw/nxagent/compext/Z.c
  nx-X11/programs/Xserver/hw/nxagent/compext/Z.h
- nxcompshad/Core.cpp
- nxcompshad/Core.h
- nxcompshad/Input.cpp
- nxcompshad/Input.h
- nxcompshad/Logger.cpp
- nxcompshad/Logger.h
- nxcompshad/Manager.cpp
- nxcompshad/Manager.h
- nxcompshad/Misc.h
- nxcompshad/Poller.h
- nxcompshad/Regions.h
- nxcompshad/Shadow.cpp
- nxcompshad/Shadow.h
- nxcompshad/Updater.cpp
- nxcompshad/Updater.h
- nxcompshad/Win.cpp
- nxcompshad/Win.h
- nxcompshad/X11.cpp
- nxcompshad/X11.h
+ nxcompshad/include/Shadow.h
+ nxcompshad/src/Core.cpp
+ nxcompshad/src/Core.h
+ nxcompshad/src/Input.cpp
+ nxcompshad/src/Input.h
+ nxcompshad/src/Logger.cpp
+ nxcompshad/src/Logger.h
+ nxcompshad/src/Manager.cpp
+ nxcompshad/src/Manager.h
+ nxcompshad/src/Misc.h
+ nxcompshad/src/Poller.h
+ nxcompshad/src/Regions.h
+ nxcompshad/src/Shadow.cpp
+ nxcompshad/src/Updater.cpp
+ nxcompshad/src/Updater.h
+ nxcompshad/src/Win.cpp
+ nxcompshad/src/Win.h
+ nxcompshad/src/X11.cpp
+ nxcompshad/src/X11.h
 Copyright: 2001, 2011, NoMachine (http://www.nomachine.com)
   2008-2014, Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>
   2011-2016, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
@@ -1001,7 +1001,7 @@ Files: nx-X11/include/XWDFile.h
  nx-X11/programs/Xserver/record/record.c
  nx-X11/programs/Xserver/record/set.c
  nx-X11/programs/Xserver/record/set.h
- nxcompshad/X11/include/XTest_nxcompshad.h
+ nxcompshad/src/X11/include/XTest_nxcompshad.h
 Copyright: 1985, 1987, 1990, 1998, The Open Group
   1985, 1987, 1994, 1998, The Open Group
   1985, 1987, 1998, The Open Group
@@ -1452,7 +1452,7 @@ Files: nx-X11/include/extensions/composite.h
  nx-X11/programs/Xserver/xfixes/xfixes.h
  nx-X11/programs/Xserver/xfixes/xfixesint.h
  nx-X11/programs/Xserver/Xext/shmint.h
- nxcompshad/X11/include/Xdamage_nxcompshad.h
+ nxcompshad/src/X11/include/Xdamage_nxcompshad.h
 Copyright: 1998, Keith Packard
   1999, Keith Packard
   2002, Keith Packard
@@ -2310,7 +2310,7 @@ Copyright: 2000, Compaq Computer Corporation
 License: MIT~X11 
 
 Files: nx-X11/programs/Xserver/hw/nxagent/X11/include/Xrandr_nxagent.h
- nxcompshad/X11/include/Xrandr_nxcompshad.h
+ nxcompshad/src/X11/include/Xrandr_nxcompshad.h
 Copyright: 2000, Compaq Computer Corporation, Inc
   2002, Hewlett-Packard Company, Inc
   2006, Intel Corporation
@@ -2908,10 +2908,11 @@ Files: ChangeLog
  nxcomp/VERSION
  nxcomp/configure.in
  nxcomp/nxcomp.pc.in
- nxcompshad/Makefile.in
+ nxcompshad/Makefile.am
  nxcompshad/VERSION
- nxcompshad/configure.in
+ nxcompshad/configure.ac
  nxcompshad/nxcompshad.pc.in
+ nxcompshad/src/Makefile.am
  nxproxy/VERSION
  nxproxy/man/nxproxy.1
  nxproxy/Makefile.am
@@ -2951,7 +2952,6 @@ Copyright: *No copyright*
 License: public-domain
 
 Files: nxcomp/install-sh
- nxcompshad/install-sh
 Copyright: 1994, X Consortium
 License: Expat~NoAdvert
 Comment:
diff --git a/debian/libxcompshad-dev.install b/debian/libxcompshad-dev.install
index 2010f5950..68318ee03 100644
--- a/debian/libxcompshad-dev.install
+++ b/debian/libxcompshad-dev.install
@@ -1,3 +1,4 @@
 usr/lib/*/libXcompshad.so
+usr/lib/*/libXcompshad.a
 usr/include/*/nx/Shadow.h
 usr/lib/*/pkgconfig/nxcompshad.pc
diff --git a/debian/rules b/debian/rules
index adfc34e5e..b59ba83a5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,7 +25,7 @@ override_dh_install:
 
 	# remove static libs
 	rm debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libXcomp.a
-	rm debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libXcompshad.a
+	rm debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libXcompshad.la
 
 	# remove extras, GL, and other unneeded headers
 	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/GL/