Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add support for custom version string | Ulrich Sibiller | 2020-01-05 | 1 | -4/+11 |
| | | | | | | | | | | | Make nxproxy and nxagent print an arbitrary version number by running make NX_VERSION_CUSTOM="myvers". nxagent and nxproxy will then show this in addition to the original version number: NXPROXY - Version myvers (3.5.99.22) NXAGENT - Version myvers (3.5.99.22) Fixes ArcticaProject/nx-libs#606 | ||||
* | auto-determine system font path and add to list of font paths | Ulrich Sibiller | 2019-05-10 | 1 | -0/+5 |
| | | | | | This will help on non-supported platforms as it will add a path the current code might not be aware of. | ||||
* | Makefile: Add clean/distclean target calls for nxdialog subdir to master ↵ | Mike Gabriel | 2019-04-07 | 1 | -0/+2 |
| | | | | Makefile's clean/distclean targets. | ||||
* | Makefile: Integrate new subproject "nxdialog". | Mike Gabriel | 2019-03-01 | 1 | -0/+8 |
| | |||||
* | Makefile: fix (dist)clean dependencies | Ulrich Sibiller | 2018-11-14 | 1 | -2/+2 |
| | | | | ensure that we have all the required def files | ||||
* | Makefile: Assure that nx-X11's Makefiles are created after everything has ↵ | Mike Gabriel | 2018-11-14 | 1 | -0/+3 |
| | | | | been defined. | ||||
* | Regression fix for a93f64e4. The test executables bails out on test failure, ↵ | Mike Gabriel | 2018-11-14 | 1 | -10/+10 |
| | | | | whereas ifdef does not. Adding "|| true" where needed. | ||||
* | Makefile: use test + && instead of if test/else/fi | Ulrich Sibiller | 2018-11-11 | 1 | -16/+16 |
| | |||||
* | Makefile: use (more) RM macros | Ulrich Sibiller | 2018-11-10 | 1 | -6/+7 |
| | |||||
* | Makefile: Rework handling auto-determined values for imake | Ulrich Sibiller | 2018-11-10 | 1 | -24/+25 |
| | | | | | create a new def file nxconfig.def and be fine. The settings in that file will be respected by all subsequent imake calls anywhere in the tree. | ||||
* | Makefile: drop intermediate NX version vars | Ulrich Sibiller | 2018-11-10 | 1 | -9/+4 |
| | |||||
* | Makefile: support systems without xkbcomp.pc. | Mihai Moldovan | 2018-11-10 | 1 | -1/+7 |
| | | | | | | | | (Very) old SLE versions don't have that file at all and we can do without - we'll just use the previous, default values. This also means that we don't need to preinstall a package containing xkbcomp.pc on Debian and derivates for the cleaning target. | ||||
* | Make: Automatically determine xkb dir | Ulrich Sibiller | 2018-11-09 | 1 | -4/+13 |
| | |||||
* | Makefile: pass down Xfont2 define for Imake | Ulrich Sibiller | 2018-07-03 | 1 | -4/+5 |
| | | | | Fixes: ArcticaProject/nx-libs#708 | ||||
* | etc/nxagent.keyboard: Drop file. Not required anymore. | Mike Gabriel | 2018-07-03 | 1 | -1/+0 |
| | |||||
* | Makefile: Run BuildIncludes and clean target in nx-X11/ with -j1. | Mike Gabriel | 2018-04-25 | 1 | -2/+2 |
| | |||||
* | Makefile: Enforce -j1 for BuildDependsOnly target. | Mike Gabriel | 2018-04-25 | 1 | -1/+1 |
| | |||||
* | Makefile targets: Rewriting and consolidating the target structure for ↵ | Mike Gabriel | 2018-04-25 | 1 | -23/+19 |
| | | | | nx-X11/ subdir (except nx-X11/lib/). | ||||
* | Makefile: Don't do a parallel clean-up of nx-X11. We have seen failures and ↵ | Mike Gabriel | 2018-04-20 | 1 | -1/+3 |
| | | | | due to the upcoming switch to autotools, it is pointless to dive into fixing it in the Imakefile stack. | ||||
* | Makefile: pass down IMAKE_DEFINES to nx-X11/programs/Xserver build system. | Mihai Moldovan | 2018-03-15 | 1 | -4/+6 |
| | |||||
* | Makefile: we don't need $(BINDIR)/bin. | Mihai Moldovan | 2018-03-06 | 1 | -1/+1 |
| | |||||
* | Makefile: only try to copy/dereference libNX* files when installing data. | Mihai Moldovan | 2017-12-30 | 1 | -1/+1 |
| | |||||
* | Makefile: install relinked program binary instead of the "temporary" one. | Mihai Moldovan | 2017-12-30 | 1 | -1/+1 |
| | |||||
* | Support building with legacy (pre-7.1.0) Xext proto versions. | Mihai Moldovan | 2017-12-16 | 1 | -4/+7 |
| | | | | | Legacy Xext proto versions are automatically detected by the main Makefile. | ||||
* | Makefile: correctly quote variables when passing them down to other programs. | Mihai Moldovan | 2017-12-16 | 1 | -5/+5 |
| | | | | | | | | | | Avoids errors like these (and of course also is a good idea in general): [ 36s] make -C nx-X11 BuildIncludes FONT_DEFINES= -DLEGACY_XFONT1 [ 36s] make: invalid option -- D [ 36s] make: invalid option -- E [ 36s] make: invalid option -- G [ 36s] make: invalid option -- A [ 36s] Usage: make [options] [target] ... | ||||
* | Support building with legacy (pre-1.4.2) libXfont(1) versions. | Mihai Moldovan | 2017-12-16 | 1 | -1/+1 |
| | | | | | | | | Partly reverts ec30a857eb0d67b232f8d43e63a6370023f4c4d0, but in a forward-compatible manner. Legacy libXfont1 versions are automatically detected by the main Makefile. | ||||
* | Makefile: Quote '$@' in make calls with double quotes. | Mike Gabriel | 2017-12-05 | 1 | -9/+9 |
| | |||||
* | Makefile: Don't use DESTDIR in configure. | Mike Gabriel | 2017-12-05 | 1 | -1/+1 |
| | | | | Fixes ArcticaProject/nx-libs#547. | ||||
* | Drop bin wrappers for nxagent and nxproxy, directly install nxproxy and ↵ | Mike Gabriel | 2017-12-05 | 1 | -30/+13 |
| | | | | | | nxagent to BINDIR. Fixes ArcticaProject/nx-libs#546. | ||||
* | Makefile: Check for dir existence before attempting to remove it. | Mike Gabriel | 2017-08-25 | 1 | -2/+2 |
| | |||||
* | Makefile: Use $(RM_DIR) rather then plain rmdir in clean-env target. | Mike Gabriel | 2017-08-25 | 1 | -2/+2 |
| | |||||
* | Convert nx-X11/lib/ build flow from imake to autotools. | Mike Gabriel | 2017-08-25 | 1 | -16/+80 |
| | |||||
* | nxcomp: Switch to autoreconf. | Mike Gabriel | 2017-07-26 | 1 | -8/+8 |
| | |||||
* | nxcompshad: Switch to autoreconf. | Mike Gabriel | 2017-07-13 | 1 | -1/+1 |
| | |||||
* | nxproxy: Switch to autoreconf. | Mike Gabriel | 2017-07-12 | 1 | -11/+5 |
| | | | | | | This also solves the last remnant of overlinking as described in GH issue #133. Fixes ArcticaProject/nx-libs#133. | ||||
* | Propagate DESTDIR and PREFIX from Makefile | Salvador Fandiño | 2017-06-05 | 1 | -1/+1 |
| | | | | | | When descending subdirectories and calling configure pass `--prefix=${DESTDIR}${PREFIX}`, so that installing in a custom directory works. | ||||
* | Makefile: Make sure that 'make all' only calls 'make build' and _not_ the ↵ | Mike Gabriel | 2017-04-13 | 1 | -1/+2 |
| | | | | global '%:' ruleset afterwards. | ||||
* | Makefile: Remove nx-X11/config/cf/date.def on clean. | Mike Gabriel | 2017-04-13 | 1 | -0/+1 |
| | |||||
* | Makefile: Fix comment above special clean rules. | Mike Gabriel | 2017-04-13 | 1 | -1/+1 |
| | |||||
* | Regression fix for added libXfont2 API support: | Mike Gabriel | 2017-04-10 | 1 | -1/+1 |
| | | | | | | | | | | - Move FONT_DEFINES and XLIBFONT definition to from Server.tmpl to Imake.tmpl. - Add FONT_DEFINES to ALLDEFINES. - Drop SpecialCObjectRules with FONT_DEFINES from various Imakefiles again, FONT_DEFINES is now set "globally". - Hand over FONT_DEFINES from main Makefile to nx-X11's make BuildEnv to make gccmakedep happy. | ||||
* | Makefile: Tell Xserver build which Xfont API to use (v2 or v1) depending on ↵ | Mike Gabriel | 2017-04-10 | 1 | -1/+6 |
| | | | | what's available in the build env. | ||||
* | Mesa subtree: Add quilt based patch system for bundled Mesa. | Mike Gabriel | 2017-04-05 | 1 | -0/+3 |
| | |||||
* | Xserver/os/oscolor.c: Follow X.org in dropping the rgb.txt file entirely. ↵ | Mike Gabriel | 2017-02-26 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | Content of that file is now hard-coded. Adopting an exact copy of os/oscolor.c from X.org leads to this compiler warning: ``` oscolor.c:844:1: warning: string length ‘7614’ is greater than the length ‘4095’ ISO C99 compilers are required to support [-Woverlength-strings] }; ^ ``` This will be address later in coordination with X.org. Note: there is a tiny change in oscolor.c as we ship it. The original X.org file includes <X11/keysym.h> which seems unneeded. We drop that one line from oscolor.c. Fixes ArcticaProject/nx-libs#259. | ||||
* | Makefile: Fix flawed uninstall-* targets. Spotted by Ionic while reviewing ↵ | Mike Gabriel | 2017-02-09 | 1 | -2/+2 |
| | | | | the nxagent RPATH changeset. Thanks! | ||||
* | Makefile: Allow longer names for variables that we want to allow distro ↵ | Mike Gabriel | 2017-02-09 | 1 | -9/+9 |
| | | | | maintainers to override. | ||||
* | Makefile: Actively set/override USRLIBDIR and SHLIBDIR when calling ↵ | Mike Gabriel | 2017-02-09 | 1 | -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 Gabriel | 2017-02-09 | 1 | -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 Gabriel | 2017-02-03 | 1 | -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-287 | Orion Poplawski | 2017-01-11 | 1 | -0/+1 |
| | |||||
* | nxcompext: Move code into Xserver subtree, as nxcompext requires Xserver ↵ | Mike Gabriel | 2016-11-15 | 1 | -5/+1 |
| | | | | | | includes at build time. Fixes ArcticaProject/nx-libs#276. |