aboutsummaryrefslogtreecommitdiff
path: root/Makefile
Commit message (Collapse)AuthorAgeFilesLines
* Makefile: Fix flawed uninstall-* targets. Spotted by Ionic while reviewing ↵Mike Gabriel2017-03-011-2/+2
| | | | the nxagent RPATH changeset. Thanks!
* Makefile: Allow longer names for variables that we want to allow distro ↵Mike Gabriel2017-03-011-9/+9
| | | | maintainers to override.
* Makefile: Actively set/override USRLIBDIR and SHLIBDIR when calling ↵Mike Gabriel2017-03-011-1/+1
| | | | | | | | | Xserver's make process. SHLIBDIR -> Points to the system's official library folder. USRLIBDIR -> In NX, this variable (amongst others) is used to set the executables RPATH (if enabled), so pointing this to SHLIBDIR/nx-X11.
* Makefile: Align variable names USRLIBDIR, SHLIBDIR (and NX_DIR) with nx-X11 ↵Mike Gabriel2017-03-011-8/+9
| | | | internal naming schemes (and use /usr/<lib>/nx/X11 rather than /usr/<lib>/nx-X11).
* Makefile: Don't create superfluous symlink for libX11.so -> ../libNX_X11.so. ↵Mike Gabriel2017-02-031-1/+0
| | | | | | The libNX_X11.so is only required at build time, so need to use it for faking libX11.so in nxagent. Fixes ArcticaProject/nx-libs#286.
* Install missing libNX_X11.so.6 symlink - fixes gh-287Orion Poplawski2017-01-111-0/+1
|
* nxcompext: Move code into Xserver subtree, as nxcompext requires Xserver ↵Mike Gabriel2016-11-151-5/+1
| | | | | | includes at build time. Fixes ArcticaProject/nx-libs#276.
* Makefile: fix up a9b145d4.Mihai Moldovan2016-11-051-1/+2
| | | | | | | | `readlink` returns nothing for non-symlinks. Careful investigation of the build environment revealed that libNX_X11.so.6.2 was no symlink to begin with - so the whole copy operation failed. Pro-actively fix the call though, in case we ever encounter a symlink there.
* Makefile: Make sure libNX_X11.so.6.2 does not get installed as symlink but ↵Mike Gabriel2016-11-021-1/+3
| | | | as actual file. (Follow-up for 5a90a63).
* XKeysymDB: ... got removed.Mike Gabriel2016-10-201-1/+0
|
* Makefile: Adapt install target to the new situation where we fake X11 ↵Mike Gabriel2016-10-011-1/+1
| | | | headers in .build-export. This fixes FTBFS during file installation into .deb and .rpm packages.
* libNX_X11 data files: Install libNX_X11 related data files.Mike Gabriel2016-07-041-0/+3
| | | | | | | | | | | - Update XErrorDB to latest X.org version. - Install XErrorDB, XKeysymDB and Xcms.txt to /usr/{local/}share/nx/. - Assure that libNX_X11 finds those files at the named location. - Update debian/ packaging files. - Update nx-libs.spec packaging file. Fixes ArcticaProject/nx-libs#153
* Rework nxagent and nxproxy wrapper scripts.Mike Gabriel2016-07-011-3/+12
| | | | | | | | | | | | | | | | | | | o Install nxagent/nxproxy executables into multi-arch path. o Fake libNX_X11.so* as $LIBDIR/nx-X11/libX11.so*. o Allow injecting different $NXAPP containing the executable name. o For e.g. x2goagent this requires the following changes: - Move x2goagent symlink from /usr/lib/x2go/bin/x2goagent to $LIBDIR/nx/bin/x2goagent - Replace /usr/bin/x2goagent by a two-liner... ``` #!/bin/sh export NXAPP=x2goagent nxagent ```
* nxauth: Drop nxauth tool completely, xauth can be successfully used with ↵Mike Gabriel2016-07-011-5/+2
| | | | nxagent / nxproxy instead.
* OPTFLAGS: Properly propagate build option flags to nxcomp{,ext,shad} and the ↵Mike Gabriel2016-07-011-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nx-X11 build scripts. Note: - The "normal" way to inject CFLAGS (and CPPFLAGS) into nx-X11 builds is copying those options over into the variable CDEBUGFLAGS. - LDFLAGS have to be handed to nx-X11 via LOCAL_LDFLAGS. This change also includes a slight change in the nx-X11 build order. Old build order: Main Makefile: - [...] - libNX_X11 + implicitly building nxcomp + implicitly building nxcompext - [...] - nxagent + implicitly building nxcompshad - [...] New build ordner: Main Makefile: - [...] - nxcomp - setup nx-X11 build env + cd nx-X11 && make BuildEnv - nx-X11/lib/* - nxcompext - nxcompshad - [...] - nxagent - [...] Fixes ArcticaProject/nx-libs#141 Fixes X2GoBTS#84
* Makefile,debian/*,nx-libs.spec,<misc>: Drop references to X2Go Project, esp. ↵Mike Gabriel2016-06-291-30/+8
| | | | | | | | | | | | drop x2goagent. The x2goagent package is being replaced by an x2goserver bin:package named x2goserver-x2goagent. This x2goserver-x2goagent bin:package will be maintained in the X2Go Project's namespace and basically wraps around nxagent. Furthermore, declare Arctica Project as upstream source for nx-libs.
* X2Go Agent: Add x2goagent.features file that informs X2Go clients about the ↵Mike Gabriel2015-12-301-0/+9
| | | | new RandR based Xinerama feature.
* library clean-up: Don't build libNX_Xinerama anymore. Use system's ↵Mike Gabriel2015-12-301-8/+0
| | | | | | | | | | libXinerama shared library. (Fixes ArcticaProject/nx-libs#49). This commit goes along with a patch from Ulrich Sibiller who managed to move the Xinerama awareness for NX sessions into the Xserver code. This makes Xinerama support for NX in libNX_Xinerama.so obsolete. Fixes ArcticaProject/nx-libs#49
* Clear header file namespace separation (<X11/...> vs. <nx-X11/...>).Mike Gabriel2015-12-281-2/+2
| | | | | | | | | | | | | | | | | | | | In the process of building nxagent against more and more system-wide installed X.org libraries, we come to the limit of including structs from this (bundled nx-X11) and that (system-wide X.Org) library. This commit introduces a clear namespace separation of headers provided by nx-X11 and headers provided by X.Org. This approach is only temporary as we want to drop all nx-X11 bundled libraries from nx-libs. However, for a while we need to make this separation clear and also ship some reduced fake X.Org headers that avoid pulling in libX* and libNX_X* symbols at the same time. This patch has been tested on Debian jessie and unstable and requires no overall testing on various distros and distro versions, as we finally will drop all libNX_X* libraries and build against X.org's client libs. For now, this hack eases our development / cleanup process.
* Makefile: Also remove nxversion.def on distclean.Mike Gabriel2015-07-141-1/+1
|
* debian/libnx-xinerama1.*: move Xinerama dir back to nx-x11-common. Only ↵Mihai Moldovan2015-04-301-1/+1
| | | | delete known files. Fixes RPM build failures.
* libnx-xinerama1: also create libXinerama symlink in postinst (and remove in ↵Mihai Moldovan2015-04-291-5/+6
| | | | | | | | | | | | | | | | | | | | | prerm.) Due to the nx-x11-common package being a noarch/allarch package, creating the symlink in nx-libs' Makefile will lead to the symlink referencing the "default" architecture dpkg uses for building noarch/allarch packages. Incidentally, this worked fine for Debian, as amd64 seems to be the default architecture. On Ubuntu, however, the default architecture up to Vivid (15.04) was i386. For those builds, the symlink pointed to the 32 bit library of libNX_Xinerama.so.1 -- essentially breaking this feature. Move the symlink creation to the arch-sensitive libnx-xinerama1 package. The postinst and prerm scriptlets will work fine, unless someone installs the i386 package version *after* the amd64 version. Given that we already create symlinks to libNX_X11 and friends using that method, no new regression is introduced. Strictly speaking that's a bug, but we'll hopefully clean that up later...
* xbitmaps cleanup: The <X11/bitmaps/*> headers are not required at build time ↵Mike Gabriel2015-04-231-5/+1
| | | | for NX.
* Makefile: clean-up auto-generated nxversion.def in clean rule (not in build ↵Mike Gabriel2015-03-051-3/+5
| | | | rule).
* Make nxagent process aware of its current NX'ish version.Mike Gabriel2015-02-171-0/+19
| | | | | | | | | | | This feature copies the way how X.Org version string and number are propagated at build time. First use case: if people start nxagent, it reports its version number on stderr. This is about being human-friendly. Second use case: None, so far. But it will now be easy to use the NXAGENT_VERSION_STRING in later feature add-ons.
* Makefile.nx-libs: Fix uninstall-lite rule. The nxproxy and nxcomp ↵Mike Gabriel2015-02-161-5/+9
| | | | uninstallation has to be in uninstall-lite, not in uninstall-full.
* Make install-lite rule in Makefile.nx-libs more predictable and not rely on ↵Mike Gabriel2015-02-161-5/+10
| | | | nxproxy/Makefile.in.
* Fix FTBFS due to the nxproxy executable already existing under ↵Mike DePaulo2015-02-161-2/+0
| | | | | | | /usr/lib/nx/bin/nx Conflicts (resolved by Mike Gabriel): debian/changelog
* Move Makefile (and auxiliary file replace.sh) into base folder. Adapt ↵Mike Gabriel2015-02-141-0/+184
packaging these scripts: debian/roll-tarballs.sh debian/rules nx-libs.spec
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 05:27:17 +0000