aboutsummaryrefslogtreecommitdiff
path: root/Makefile
Commit message (Collapse)AuthorAgeFilesLines
* Makefile: Assure that nx-X11's Makefiles are created after everything has ↵Mike Gabriel2018-11-141-0/+3
| | | | been defined.
* Regression fix for a93f64e4. The test executables bails out on test failure, ↵Mike Gabriel2018-11-141-10/+10
| | | | whereas ifdef does not. Adding "|| true" where needed.
* Makefile: use test + && instead of if test/else/fiUlrich Sibiller2018-11-111-16/+16
|
* Makefile: use (more) RM macrosUlrich Sibiller2018-11-101-6/+7
|
* Makefile: Rework handling auto-determined values for imakeUlrich Sibiller2018-11-101-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 varsUlrich Sibiller2018-11-101-9/+4
|
* Makefile: support systems without xkbcomp.pc.Mihai Moldovan2018-11-101-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 dirUlrich Sibiller2018-11-091-4/+13
|
* Makefile: pass down Xfont2 define for ImakeUlrich Sibiller2018-07-031-4/+5
| | | | Fixes: ArcticaProject/nx-libs#708
* etc/nxagent.keyboard: Drop file. Not required anymore.Mike Gabriel2018-07-031-1/+0
|
* Makefile: Run BuildIncludes and clean target in nx-X11/ with -j1.Mike Gabriel2018-04-251-2/+2
|
* Makefile: Enforce -j1 for BuildDependsOnly target.Mike Gabriel2018-04-251-1/+1
|
* Makefile targets: Rewriting and consolidating the target structure for ↵Mike Gabriel2018-04-251-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 Gabriel2018-04-201-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 Moldovan2018-03-151-4/+6
|
* Makefile: we don't need $(BINDIR)/bin.Mihai Moldovan2018-03-061-1/+1
|
* Makefile: only try to copy/dereference libNX* files when installing data.Mihai Moldovan2017-12-301-1/+1
|
* Makefile: install relinked program binary instead of the "temporary" one.Mihai Moldovan2017-12-301-1/+1
|
* Support building with legacy (pre-7.1.0) Xext proto versions.Mihai Moldovan2017-12-161-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 Moldovan2017-12-161-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 Moldovan2017-12-161-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 Gabriel2017-12-051-9/+9
|
* Makefile: Don't use DESTDIR in configure.Mike Gabriel2017-12-051-1/+1
| | | | Fixes ArcticaProject/nx-libs#547.
* Drop bin wrappers for nxagent and nxproxy, directly install nxproxy and ↵Mike Gabriel2017-12-051-30/+13
| | | | | | nxagent to BINDIR. Fixes ArcticaProject/nx-libs#546.
* Makefile: Check for dir existence before attempting to remove it.Mike Gabriel2017-08-251-2/+2
|
* Makefile: Use $(RM_DIR) rather then plain rmdir in clean-env target.Mike Gabriel2017-08-251-2/+2
|
* Convert nx-X11/lib/ build flow from imake to autotools.Mike Gabriel2017-08-251-16/+80
|
* nxcomp: Switch to autoreconf.Mike Gabriel2017-07-261-8/+8
|
* nxcompshad: Switch to autoreconf.Mike Gabriel2017-07-131-1/+1
|
* nxproxy: Switch to autoreconf.Mike Gabriel2017-07-121-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 MakefileSalvador Fandiño2017-06-051-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 Gabriel2017-04-131-1/+2
| | | | global '%:' ruleset afterwards.
* Makefile: Remove nx-X11/config/cf/date.def on clean.Mike Gabriel2017-04-131-0/+1
|
* Makefile: Fix comment above special clean rules.Mike Gabriel2017-04-131-1/+1
|
* Regression fix for added libXfont2 API support:Mike Gabriel2017-04-101-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 Gabriel2017-04-101-1/+6
| | | | what's available in the build env.
* Mesa subtree: Add quilt based patch system for bundled Mesa.Mike Gabriel2017-04-051-0/+3
|
* Xserver/os/oscolor.c: Follow X.org in dropping the rgb.txt file entirely. ↵Mike Gabriel2017-02-261-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 Gabriel2017-02-091-2/+2
| | | | the nxagent RPATH changeset. Thanks!
* Makefile: Allow longer names for variables that we want to allow distro ↵Mike Gabriel2017-02-091-9/+9
| | | | maintainers to override.
* Makefile: Actively set/override USRLIBDIR and SHLIBDIR when calling ↵Mike Gabriel2017-02-091-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-02-091-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