[X2go-Commits] nx-libs.git - test (branch) updated: 626c9b8f9f2edf56b6cb3e8c406015340e366022

X2go dev team git-admin at x2go.org
Fri Oct 21 00:46:18 CEST 2011


The branch, test has been updated
       via  626c9b8f9f2edf56b6cb3e8c406015340e366022 (commit)
       via  da1acdad5b4103c823e2be8c0a63d98c3a11ef4e (commit)
       via  417054b9f3cef7beaa95ef164914228f1427253c (commit)
       via  78ea18f1d9265651f4b8760619e9cf9285b5b0fd (commit)
       via  470425e7c77c272089bc3d21b3e0b8240a49f6e0 (commit)
      from  89490614c2965370f7e32296d93c23771bad4d12 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 626c9b8f9f2edf56b6cb3e8c406015340e366022
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Oct 21 00:46:14 2011 +0200

    Remove enforced C flags, use C flags as inherited.

commit da1acdad5b4103c823e2be8c0a63d98c3a11ef4e
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Oct 21 00:45:16 2011 +0200

    re-enable C flags (for later removal)

commit 417054b9f3cef7beaa95ef164914228f1427253c
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Oct 21 00:44:01 2011 +0200

    Assure build against nx-X11.

commit 78ea18f1d9265651f4b8760619e9cf9285b5b0fd
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Oct 21 00:35:41 2011 +0200

    run dh auto install again

commit 470425e7c77c272089bc3d21b3e0b8240a49f6e0
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Oct 21 00:34:25 2011 +0200

    fix main Makefile

-----------------------------------------------------------------------

Summary of changes:
 Makefile                |   19 ++++++++-----------
 debian/rules            |    1 -
 nxcompshad/Makefile.in  |    4 ++--
 nxcompshad/configure.in |    7 +------
 4 files changed, 11 insertions(+), 20 deletions(-)

The diff of changes is:
diff --git a/Makefile b/Makefile
index 0f04b06..ce1e94c 100755
--- a/Makefile
+++ b/Makefile
@@ -5,21 +5,18 @@ all: build
 build: build-arch build-indep
 
 clean:
-	#cd nx-X11 && make $@
-	cd nxcomp && test Makefile && make $@
-	cd nxcompext && test Makefile && make $@
-	cd nxcompshad && test Makefile && make $@
+	cd nx-X11 && test -f Makefile && make $@ || true
+	cd nxcomp && test -f Makefile && make $@ || true
+	cd nxcompext && test -f Makefile && make $@ || true
+	cd nxcompshad && test -f Makefile && make $@ || true
 
 distclean:
-	#cd nx-X11 && make clean
-	cd nxcomp && test Makefile && make $@
-	cd nxcompext && test Makefile && make $@
-	cd nxcompshad && test Makefile && make $@
+	cd nx-X11 && test -f Makefile && make clean || true
+	cd nxcomp && test -f Makefile && make distclean || true
+	cd nxcompext && test -f Makefile && make distclean || true
+	cd nxcompshad && test -f Makefile && make distclean || true
 
 build-arch:
-	cd nxcomp && autoconf
-	cd nxcompext && autoconf
-	cd nxcompshad && autoconf
 	cd nx-X11 && make World
 
 build-indep:
diff --git a/debian/rules b/debian/rules
index 6e57318..faaa775 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,4 +13,3 @@ endif
 
 override_dh_auto_install:
 
-override_dh_auto_clean:
\ No newline at end of file
diff --git a/nxcompshad/Makefile.in b/nxcompshad/Makefile.in
index 1580a35..c6aeaf0 100644
--- a/nxcompshad/Makefile.in
+++ b/nxcompshad/Makefile.in
@@ -48,7 +48,7 @@ CCINCLUDES  =
 CCDEFINES   =
 
 LDFLAGS     = @LDFLAGS@
-LIBS        = @LIBS@ -L/usr/X11R6/lib -lX11
+LIBS        = @LIBS@ -lX11
 
 #
 # Only if THREADS is defined.
@@ -162,7 +162,7 @@ $(LIBDLL): $(LIBARCHIVE)
 		-Wl,--enable-auto-import \
 		-Wl,--whole-archive ${LIBARCHIVE} \
 		-Wl,--no-whole-archive \
-		${LIBS} -L/usr/X11R6/lib
+		${LIBS}
 
 $(PROGRAM):	$(MOBJ) $(COBJ) $(CXXOBJ) $(LIBDLL)
 #		$(CC) $(CCFLAGS) -o $@ $(MOBJ) $(MLIBS)
diff --git a/nxcompshad/configure.in b/nxcompshad/configure.in
index 8e5b2ee..8253ef0 100644
--- a/nxcompshad/configure.in
+++ b/nxcompshad/configure.in
@@ -5,11 +5,6 @@ dnl Prolog
 AC_INIT(Shadow.h)
 AC_PREREQ(2.13)
 
-#dnl Reset default compilation flags.
-#
-#CXXFLAGS="-O3"
-#CPPFLAGS="-O3"
-#
 dnl Reset default linking directives.
 
 LIBSTATIC=""
@@ -19,7 +14,7 @@ dnl Prefer headers and libraries from nx-X11, if present.
 
 if test -d "../nx-X11/exports/include" ; then
     CXXFLAGS="$CXXFLAGS -I../nx-X11/exports/include"
-    LIBS="-L../nx-X11/exports/lib $LIBS "
+    LIBS="-L../nx-X11/exports/lib"
 fi
 
 dnl Check whether --with-ipaq was given.


hooks/post-receive
-- 
nx-libs.git (NX libraries)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "nx-libs.git" (NX libraries).




More information about the x2go-commits mailing list