diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-01 13:10:06 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-01 13:10:06 +0200 |
| commit | b666a3776df04e6d2712b04ab4ca9b582aa3c6cc (patch) | |
| tree | 5ae7d463f5a67ddb3a35f0ab86fc225c386513a3 /Makefile | |
| parent | 4cbfc5f98ea8311b0f01bcf2c219fd42c80adccd (diff) | |
| parent | d650a0b47eadeb675e2d2cf03ad10a4dbc564971 (diff) | |
| download | nx-libs-b666a3776df04e6d2712b04ab4ca9b582aa3c6cc.tar.gz nx-libs-b666a3776df04e6d2712b04ab4ca9b582aa3c6cc.tar.bz2 nx-libs-b666a3776df04e6d2712b04ab4ca9b582aa3c6cc.zip | |
Merge branch 'sunweaver-pr/properly-apply-optflags-at-buildtime' into 3.6.x
Attributes GH PR #149: https://github.com/ArcticaProject/nx-libs/pull/149
Reviewed by Vadim Troshchinskiy <vadim@qindel.com> -- Fri, 01 Jul 2016 02:02:49 -0700
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 14 |
1 files changed, 11 insertions, 3 deletions
@@ -49,9 +49,7 @@ build-lite: build-full: # in the full case, we rely on "magic" in the nx-X11 imake-based makefiles... - cd nxcomp && autoconf - cd nxcompext && autoconf - cd nxcompshad && autoconf + cd nxcomp && autoconf && (${CONFIGURE}) && ${MAKE} # prepare nx-X11/config/cf/nxversion.def sed \ @@ -62,6 +60,16 @@ build-full: nx-X11/config/cf/nxversion.def.in \ > nx-X11/config/cf/nxversion.def + # prepare Makefiles and the nx-X11 symlinking magic + cd nx-X11 && make BuildEnv + + # build libNX_X11 and libNX_Xext prior to building + # nxcomp{ext,shad}. + cd nx-X11/lib && make + + cd nxcompext && autoconf && (${CONFIGURE}) && ${MAKE} + cd nxcompshad && autoconf && (${CONFIGURE}) && ${MAKE} + cd nx-X11 && ${MAKE} World cd nxproxy && autoconf && (${CONFIGURE}) && ${MAKE} |