Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nx-libs
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dimbor
nx-libs
Commits
b4b4e209
Commit
b4b4e209
authored
Feb 14, 2012
by
Mike Gabriel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update patch: 001_add-main-makefile.full+lite.patch, use curly braces for macros.
parent
280d8751
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
11 deletions
+13
-11
changelog
debian/changelog
+2
-0
001_add-main-makefile.full+lite.patch
debian/patches/001_add-main-makefile.full+lite.patch
+11
-11
No files found.
debian/changelog
View file @
b4b4e209
...
@@ -6,6 +6,8 @@ nx-libs (2:3.5.0.11-0) UNRELEASED; urgency=low
...
@@ -6,6 +6,8 @@ nx-libs (2:3.5.0.11-0) UNRELEASED; urgency=low
* Do not install libXinerama directly into /usr/lib/nx. Recommended method is
* Do not install libXinerama directly into /usr/lib/nx. Recommended method is
installing to /usr/lib/nx/Xinerama, so that you can enable/disable usage of
installing to /usr/lib/nx/Xinerama, so that you can enable/disable usage of
the Xinerama extension.
the Xinerama extension.
* Update patch: 001_add-main-makefile.full+lite.patch, use curly braces for
macros.
[ Jan Engelhardt ]
[ Jan Engelhardt ]
* Update patch: 001_add-main-makefile.full+lite.patch, allow passing of
* Update patch: 001_add-main-makefile.full+lite.patch, allow passing of
...
...
debian/patches/001_add-main-makefile.full+lite.patch
View file @
b4b4e209
...
@@ -9,12 +9,12 @@ Last-Update: 2011-12-31
...
@@ -9,12 +9,12 @@ Last-Update: 2011-12-31
+#!/usr/bin/make -f
+#!/usr/bin/make -f
+
+
+%:
+%:
+ $
(MAKE)
-C nxcomp $@
+ $
{MAKE}
-C nxcomp $@
+ $
(MAKE)
-C nxproxy $@
+ $
{MAKE}
-C nxproxy $@
+ if test -d nx-X11; then \
+ if test -d nx-X11; then \
+ $
(MAKE)
-C nxcompext $@; \
+ $
{MAKE}
-C nxcompext $@; \
+ $
(MAKE)
-C nxcompshad; \
+ $
{MAKE}
-C nxcompshad; \
+ $
(MAKE)
-C nx-X11 $@; \
+ $
{MAKE}
-C nx-X11 $@; \
+ fi
+ fi
+
+
+all: build
+all: build
...
@@ -23,20 +23,20 @@ Last-Update: 2011-12-31
...
@@ -23,20 +23,20 @@ Last-Update: 2011-12-31
+ echo "No testing for NX (redistributed)"
+ echo "No testing for NX (redistributed)"
+
+
+build-lite:
+build-lite:
+ cd nxcomp && autoconf && ./configure && $
(MAKE)
+ cd nxcomp && autoconf && ./configure && $
{MAKE}
+ cd nxproxy && autoconf && ./configure && $
(MAKE)
+ cd nxproxy && autoconf && ./configure && $
{MAKE}
+
+
+build-full:
+build-full:
+# in the full case, we rely on "magic" in the nx-X11 imake-based makefiles...
+# in the full case, we rely on "magic" in the nx-X11 imake-based makefiles...
+ cd nxcomp && autoconf && ./configure
+ cd nxcomp && autoconf && ./configure
+ cd nxcompext && autoconf
+ cd nxcompext && autoconf
+ cd nxcompshad && autoconf
+ cd nxcompshad && autoconf
+ cd nx-X11 && $
(MAKE)
World
+ cd nx-X11 && $
{MAKE}
World
+ cd nxproxy && autoconf && (${CONFIGURE}) && $
(MAKE)
+ cd nxproxy && autoconf && (${CONFIGURE}) && $
{MAKE}
+
+
+build:
+build:
+ if ! test -d nx-X11; then \
+ if ! test -d nx-X11; then \
+ $
(MAKE)
build-lite; \
+ $
{MAKE}
build-lite; \
+ else \
+ else \
+ $
(MAKE)
build-full; \
+ $
{MAKE}
build-full; \
+ fi
+ fi
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment