Revert "release 3.5.0.19"

This reverts commit e77bf36.
uli42 · Mar 28, 2013 · db7feaf · db7feaf
1 parent e77bf36
commit db7feaf
Show file tree

Hide file tree

Showing 177 changed files with 7,442 additions and 14,117 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,10 +1,10 @@
-nx-libs (2:3.5.0.19-0) unstable; urgency=low
+nx-libs (2:3.5.0.19-0) UNRELEASED; urgency=low
 
   * Add Jan's reasoning for using string_rep() instead of bash based
     string substitutions as comment to /debian/Makefile.replaces.sh.
   * Fix FTBFS for .deb packages after including fix for #145.
 
- -- Mike Gabriel <[email protected]>  Thu, 28 Mar 2013 08:55:02 +0100
+ -- Mike Gabriel <[email protected]>  Sat, 23 Mar 2013 00:42:01 +0100
 
 nx-libs (2:3.5.0.18-0) unstable; urgency=low
 

diff --git a/nx-X11/Makefile b/nx-X11/Makefile
@@ -32,8 +32,8 @@ VERSSRC = $(CONFIGSRC)/util/printver.c
 VERSPROG = $(CONFIGSRC)/util/printver.exe
 
 all:
-	@${MAKE} ${MAKE_OPTS} xmakefile-exists || $(MAKE) all-initial
-	@${MAKE} ${MAKE_OPTS} $@
+	@$(MAKE_CMD) xmakefile-exists || $(MAKE) all-initial
+	@$(MAKE_CMD) $@
 
 all-initial:
 	@echo Please use make World, or on NT use nmake World.Win32.
@@ -57,8 +57,8 @@ World:
 	@date
 	@echo ""
 	@if [ -f xmakefile ]; then \
-	    ${MAKE} ${MAKE_OPTS} -k distclean || \
-	    ${MAKE} ${MAKE_OPTS} -k clean || \
+	    $(MAKE_CMD) -k distclean || \
+	    $(MAKE_CMD) -k clean || \
 	    $(RM) xmakefile; \
 	fi
 	@if [ ! -f $(IRULESRC)/host.def ]; then \
@@ -84,14 +84,14 @@ World:
 #	fi
 	cd $(IMAKESRC) && $(MAKE) $(FLAGS) clean
 	$(MAKE) $(MFLAGS) Makefile.boot
-	${MAKE} ${MAKE_OPTS} $(MFLAGS) version.def
+	$(MAKE_CMD) $(MFLAGS) version.def
 	$(MAKE) $(MFLAGS) Makefile.boot
-	${MAKE} ${MAKE_OPTS} $(MFLAGS) VerifyOS
-	${MAKE} ${MAKE_OPTS} $(MFLAGS) Makefiles
-	${MAKE} ${MAKE_OPTS} $(MFLAGS) BOOTSTRAPSUBDIRS= clean
-	${MAKE} ${MAKE_OPTS} $(MFLAGS) includes
-	${MAKE} ${MAKE_OPTS} $(MFLAGS) depend
-	${MAKE} ${MAKE_OPTS} $(MFLAGS) $(WORLDOPTS) World
+	$(MAKE_CMD) $(MFLAGS) VerifyOS
+	$(MAKE_CMD) $(MFLAGS) Makefiles
+	$(MAKE_CMD) $(MFLAGS) BOOTSTRAPSUBDIRS= clean
+	$(MAKE_CMD) $(MFLAGS) includes
+	$(MAKE_CMD) $(MFLAGS) depend
+	$(MAKE_CMD) $(MFLAGS) $(WORLDOPTS) World
 	@echo ""
 	@date
 	@echo ""
@@ -138,7 +138,6 @@ Makefile::
 
 xmakefile: Imakefile
 	$(RM) xmakefile
-	@rm -f $(IRULESRC)/date.def; echo "" > $(IRULESRC)/date.def;
 	$(IMAKE_CMD) -s xmakefile -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR)
 
 World.Win32:
@@ -154,15 +153,15 @@ World.Win32:
 	-if exist xmakefile.bak del xmakefile.bak
 	-if exist xmakefile ren xmakefile xmakefile.bak
 	$(IMAKE:/=\) -s xmakefile -I$(IRULESRC) $(IMAKE_DEFINES) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR)
-	${MAKE} ${MAKE_OPTS} $(MFLAGS) VerifyOS
-	${MAKE} ${MAKE_OPTS} $(MFLAGS) Makefiles
-	${MAKE} ${MAKE_OPTS} $(MFLAGS) clean
+	$(MAKE_CMD) $(MFLAGS) VerifyOS
+	$(MAKE_CMD) $(MFLAGS) Makefiles
+	$(MAKE_CMD) $(MFLAGS) clean
 	cd $(CONFIGSRC)\util
 	$(MAKE) mkdirhier.exe
 	cd ..\..
-	${MAKE} ${MAKE_OPTS} $(MFLAGS) includes
-	${MAKE} ${MAKE_OPTS} $(MFLAGS) depend
-	${MAKE} ${MAKE_OPTS} $(MFLAGS) $(WIN32WORLDOPTS)
+	$(MAKE_CMD) $(MFLAGS) includes
+	$(MAKE_CMD) $(MFLAGS) depend
+	$(MAKE_CMD) $(MFLAGS) $(WIN32WORLDOPTS)
 	@echo :
 	@echo :
 	@echo Full build of $(RELEASE) complete.
@@ -198,38 +197,33 @@ World.OS2:
 # a copy of every rule that might be invoked at top level
 
 clean:
-	    -${MAKE_CMD} ${MAKE_OPTS} $@
-	    find config -type f | egrep '.*/Makefile$$' | while read makefile; do rm -f $$makefile; done
-	    find lib -type f | egrep '.*/Makefile$$' | while read makefile; do rm -f $$makefile; done
-	    find programs -type f | egrep '.*/Makefile$$' | while read makefile; do rm -f $$makefile; done
-	    find include -type f | egrep '.*/Makefile$$' | while read makefile; do rm -f $$makefile; done
-	    rm -f config/cf/{version.def,date.def}
+	    $(MAKE_CMD) $@
 dangerous_strip_clean:
-	    ${MAKE} ${MAKE_OPTS} $@
+	    $(MAKE_CMD) $@
 distclean:
-	    -${MAKE} ${MAKE_OPTS} $@
+	    $(MAKE_CMD) $@
 	    $(RM) xmakefile $(IRULESRC)/version.def $(IRULESRC)/date.def
 depend:
-	    ${MAKE} ${MAKE_OPTS} $@
+	    $(MAKE_CMD) $@
 Everything:
-	    ${MAKE} ${MAKE_OPTS} $@
+	    $(MAKE_CMD) $@
 external.ln:
-	    ${MAKE} ${MAKE_OPTS} $@
+	    $(MAKE_CMD) $@
 includes:
-	    ${MAKE} ${MAKE_OPTS} $@
+	    $(MAKE_CMD) $@
 install.sdk:
-	    ${MAKE} ${MAKE_OPTS} $@
+	    $(MAKE_CMD) $@
 install.ln:
-	    ${MAKE} ${MAKE_OPTS} $@
+	    $(MAKE_CMD) $@
 install.man:
-	    ${MAKE} ${MAKE_OPTS} $@
+	    $(MAKE_CMD) $@
 install:
-	    ${MAKE} ${MAKE_OPTS} $@
+	    $(MAKE_CMD) $@
 Makefiles:
-	    ${MAKE} ${MAKE_OPTS} $@
+	    $(MAKE_CMD) $@
 man_keywords:
-	    ${MAKE} ${MAKE_OPTS} $@
+	    $(MAKE_CMD) $@
 tags:
-	    ${MAKE} ${MAKE_OPTS} $@
+	    $(MAKE_CMD) $@
 VerifyOS:
-	    ${MAKE} ${MAKE_OPTS} $@
+	    $(MAKE_CMD) $@
diff --git a/nx-X11/config/cf/Imake.rules b/nx-X11/config/cf/Imake.rules
@@ -2124,9 +2124,9 @@ LintLibReferences(varname,libname,libsource)
  */
 #ifndef ProjectUnsharedFontLibReferences
 #define ProjectUnsharedFontLibReferences()					@@\
-DEPFONTLIB = _UseCat($(USRLIBDIR)/,XBuildLibDir/,LibraryTargetName(NX_Xfont))	@@\
-FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) LoaderLibPrefix -lNX_Xfont		@@\
-LintLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC))
+DEPFONTLIB = _UseCat($(USRLIBDIR)/,XBuildLibDir/,LibraryTargetName(Xfont))	@@\
+FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) LoaderLibPrefix -lXfont		@@\
+LintLibReferences(XFONT,Xfont,$(FONTLIBSRC))
 #endif
 
 /*
@@ -2142,9 +2142,9 @@ LintLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC))
 #ifndef SharedFontLibReferences
 #define SharedFontLibReferences()					@@\
 SOFONTREV = SharedFontRev						@@\
-DEPFONTLIB = SharedLibDependencies(NX_Xfont,$(FONTLIBSRC),SOFONTREV)	@@\
-FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) LoaderLibPrefix -lNX_Xfont	@@\
-LintLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC))
+DEPFONTLIB = SharedLibDependencies(Xfont,$(FONTLIBSRC),SOFONTREV)	@@\
+FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) LoaderLibPrefix -lXfont	@@\
+LintLibReferences(XFONT,Xfont,$(FONTLIBSRC))
 #endif
 
 /*

diff --git a/nx-X11/config/cf/Imake.tmpl b/nx-X11/config/cf/Imake.tmpl
@@ -820,12 +820,12 @@ TCLIBDIR = TclLibDir
 
 #ifndef UsrLibDir
 #ifdef ProjectRoot
-#define UsrLibDir Concat4(ProjectRoot,/,LibDirName,/nx)
+#define UsrLibDir Concat3(ProjectRoot,/,LibDirName)
 #ifndef AlternateUsrLibDir
 #define AlternateUsrLibDir YES
 #endif
 #else
-#define UsrLibDir Concat4(/usr,/,LibDirName,/nx)
+#define UsrLibDir Concat3(/usr,/,LibDirName)
 #ifndef AlternateUsrLibDir
 #define AlternateUsrLibDir NO
 #endif
@@ -863,7 +863,7 @@ TCLIBDIR = TclLibDir
 #endif
 #ifndef IncRoot
 #ifdef ProjectRoot
-#define IncRoot Concat(ProjectRoot,/include/nx)
+#define IncRoot Concat(ProjectRoot,/include)
 #ifndef AlternateIncRoot
 #define AlternateIncRoot YES
 #endif

diff --git a/nx-X11/config/cf/Motif.tmpl b/nx-X11/config/cf/Motif.tmpl
@@ -465,9 +465,9 @@ TOP_MOTIF_INCLUDES = -I$(MINCLUDESRC)
 #endif
 
 #if SharedLibXm
-SharedLibReferences(XM,NX_Xm,$(MWIDGETSRC),SOXMREV,SharedXmRev)
+SharedLibReferences(XM,Xm,$(MWIDGETSRC),SOXMREV,SharedXmRev)
 #else
-ProjectUnsharedLibReferences(XM,NX_Xm,$(MWIDGETSRC),MBuildLibDir)
+ProjectUnsharedLibReferences(XM,Xm,$(MWIDGETSRC),MBuildLibDir)
 #endif
 
 #if SharedLibMrm

diff --git a/nx-X11/config/cf/X11.rules b/nx-X11/config/cf/X11.rules
@@ -36,17 +36,17 @@ XCOMM $XFree86: xc/config/cf/X11.rules,v 1.6 2001/01/17 16:22:31 dawes Exp $
 #endif
 
 #if defined(X11ProjectRoot)
-# define XBinDir	$(XPROJECTROOT)/lib/nx/bin
+# define XBinDir	$(XPROJECTROOT)/bin
 #elif defined(ProjectRoot) 
-# define XBinDir	$(PROJECTROOT)/lib/nx/bin
+# define XBinDir	$(PROJECTROOT)/bin
 #else
 # define XBinDir	$(BINDIR)
 #endif
 
 #ifdef X11ProjectRoot
-# define XUsrLibDirPath	$(USRLIBDIR)/nx:$(XPROJECTROOT)
+# define XUsrLibDirPath	$(USRLIBDIR):$(XPROJECTROOT)/lib
 #else
-# define XUsrLibDirPath	$(USRLIBDIR)/nx
+# define XUsrLibDirPath	$(USRLIBDIR)
 #endif
 #ifdef UsrLibDirPath
 # undef UsrLibDirPath
@@ -60,7 +60,7 @@ XCOMM $XFree86: xc/config/cf/X11.rules,v 1.6 2001/01/17 16:22:31 dawes Exp $
 #if ImportX11
 # define XLdPreLibs	-L$(LIBSRC)
 #elif defined(UseInstalledX11) && defined(X11ProjectRoot)
-# define XLdPreLibs	-L$(XPROJECTROOT)
+# define XLdPreLibs	-L$(XPROJECTROOT)/lib
 #else
 # define XLdPreLibs	/**/
 #endif
@@ -70,7 +70,7 @@ XCOMM $XFree86: xc/config/cf/X11.rules,v 1.6 2001/01/17 16:22:31 dawes Exp $
 #define LdPreLibs	LdPreLib XLdPreLibs
 
 #ifdef X11ProjectRoot
-# define XLdPostLibs	-L$(XPROJECTROOT)
+# define XLdPostLibs	-L$(XPROJECTROOT)/lib
 #else
 # define XLdPostLibs	/**/
 #endif
@@ -86,7 +86,7 @@ XCOMM $XFree86: xc/config/cf/X11.rules,v 1.6 2001/01/17 16:22:31 dawes Exp $
 #  define TopXInclude	-I$(TOP)/exports/include
 #else
 #  ifdef X11ProjectRoot
-#   define TopXInclude	-I$(XPROJECTROOT)/../../include/nx
+#   define TopXInclude	-I$(XPROJECTROOT)/include
 #  else
 #   define TopXInclude	/**/
 #  endif
@@ -98,7 +98,7 @@ XCOMM $XFree86: xc/config/cf/X11.rules,v 1.6 2001/01/17 16:22:31 dawes Exp $
 #define TopIncludes	TopInclude $(TOP_X_INCLUDES)
 
 #if UseInstalledX11 && defined(X11ProjectRoot)
-# define X11BuildLibPath	$(XPROJECTROOT)
+# define X11BuildLibPath	$(XPROJECTROOT)/lib
 #elif UseInstalledX11
 # define X11BuildLibPath	$(USRLIBDIR)
 #elif ImportX11