aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2017-07-26 10:38:46 +0200
committerMihai Moldovan <ionic@ionic.de>2017-07-26 10:38:46 +0200
commit7897834ce578dc394649ed09acb9f95fc04915ff (patch)
treea0bcbfa2c4ae1111ad3d49390c7abd0ae3a9a2ed /Makefile
parent9193d11eeeea933e293acd5e0f03fa4e9887186b (diff)
parent4afc641fdd8c03bd708f50e0c3691b5de7ea1dba (diff)
downloadnx-libs-7897834ce578dc394649ed09acb9f95fc04915ff.tar.gz
nx-libs-7897834ce578dc394649ed09acb9f95fc04915ff.tar.bz2
nx-libs-7897834ce578dc394649ed09acb9f95fc04915ff.zip
Merge branch 'sunweaver-pr/nxcomp-autoreconf' into 3.6.x
Attributes GH PR #480: https://github.com/ArcticaProject/nx-libs/pull/480
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile16
1 files changed, 8 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index d38015a00..2b4e5dfbd 100644
--- a/Makefile
+++ b/Makefile
@@ -54,14 +54,7 @@ all:
test:
echo "No testing for NX (redistributed)"
-build-lite:
- cd nxcomp && autoconf && (${CONFIGURE}) && ${MAKE}
- cd nxproxy && autoreconf -vfsi && (${CONFIGURE}) && ${MAKE}
-
-build-full:
-# in the full case, we rely on "magic" in the nx-X11 imake-based makefiles...
- cd nxcomp && autoconf && (${CONFIGURE}) && ${MAKE}
-
+build-env:
# prepare nx-X11/config/cf/nxversion.def
sed \
-e 's/###NX_VERSION_MAJOR###/$(NX_VERSION_MAJOR)/' \
@@ -74,6 +67,13 @@ build-full:
# prepare Makefiles and the nx-X11 symlinking magic
cd nx-X11 && make BuildEnv FONT_DEFINES=$(FONT_DEFINES)
+build-lite:
+ cd nxcomp && autoreconf -vfsi && (${CONFIGURE}) && ${MAKE}
+ cd nxproxy && autoreconf -vfsi && (${CONFIGURE}) && ${MAKE}
+
+build-full: build-env
+# in the full case, we rely on "magic" in the nx-X11 imake-based makefiles...
+ cd nxcomp && autoreconf -vfsi && (${CONFIGURE}) && ${MAKE}
# build libNX_X11 and libNX_Xext prior to building
# nxcomp{ext,shad}.
cd nx-X11/lib && make