Hello.
The attached patches fix three problems:
dx-make-jN.patch: fixes make -jN builds (missing dependency and three rules
using/overwriting/deleting the same temporary files)
dx-sys_h.patch: <linux/sys.h> is a kernel-space header and shouldn't be used
in normal programs. It is also no longer included in current userspace kernel
headers package in Fedora. OpenDX build fine without it so I assume it's not
even necessary.
dx-typo.patch: fixes a typo which prevented the Help from being loaded.
Regards,
R.
--
Fedora Extras contributor http://fedoraproject.org/wiki/DominikMierzejewski
MPlayer developer http://rpm.greysector.net/mplayer/
"Faith manages."
-- Delenn to Lennier in Babylon 5:"Confessions and Lamentations"
--- dx-4.4.0/src/exec/dxmods/Makefile.am.r 2003-08-19 00:51:10.000000000
+0200
+++ dx-4.4.0/src/exec/dxmods/Makefile.am 2006-09-17 03:29:07.000000000
+0200
@@ -13,6 +14,8 @@
dxmdf_DATA = dx.mdf
+user.c: dx.mdf
+
_complex.o: _compparse.h
HEADERS1 = \
--- dx-4.4.0/src/exec/dxmods/local.mk.in.r 2003-07-12 02:12:06.000000000
+0200
+++ dx-4.4.0/src/exec/dxmods/local.mk.in 2006-09-17 03:31:32.000000000
+0200
@@ -14,23 +14,23 @@
dxcm.mdf: ${srcdir}/dxmdf.src
-rm -f dxcm.mdf
- cp ${srcdir}/dxmdf.src tmp.c
- $(CPP) $(INCLUDES) $(MDF) $(DEFS) tmp.c > dxcm.mdf
- -rm -f tmp.c
+ cp ${srcdir}/dxmdf.src dxcm.tmp.c
+ $(CPP) $(INCLUDES) $(MDF) $(DEFS) dxcm.tmp.c > dxcm.mdf
+ -rm -f dxcm.tmp.c
dx.mdf: ${srcdir}/dxmdf.src
echo MYINC: $(MYINC)
-rm -f dx.mdf
- cp ${srcdir}/dxmdf.src tmp.c
- $(CPP) $(INCLUDES) $(MYINC) $(MDF) $(DEFS) -DCPLUSPLUS_UI
-DEXECUTIVE_MODS tmp.c > dx.mdf
+ cp ${srcdir}/dxmdf.src dx.tmp.c
+ $(CPP) $(INCLUDES) $(MYINC) $(MDF) $(DEFS) -DCPLUSPLUS_UI
-DEXECUTIVE_MODS dx.tmp.c > dx.mdf
@echo '/^ *$$/{' > stripl.sed
@echo 'N' >> stripl.sed
@echo '/^ *\\n *$$/D' >> stripl.sed
@echo '}' >> stripl.sed
- cat dx.mdf |sed '/^#/d' > tmp.mdf
- cat tmp.mdf |sed -f stripl.sed > dx.mdf
- @rm -f stripl.sed tmp.mdf
- -rm -f tmp.c
+ cat dx.mdf |sed '/^#/d' > dx.tmp.mdf
+ cat dx.tmp.mdf |sed -f stripl.sed > dx.mdf
+ @rm -f stripl.sed dx.tmp.mdf
+ -rm -f dx.tmp.c
.y.h:
$(YACC) $(YFLAGS) -d ${srcdir}/$*.y
--- dx-4.4.0/src/exec/libdx/memory.c.r 2006-01-03 01:57:41.000000000 +0100
+++ dx-4.4.0/src/exec/libdx/memory.c 2006-09-17 03:29:07.000000000 +0200
@@ -66,7 +66,6 @@
#if linux
#include <linux/kernel.h>
-#include <linux/sys.h>
#include <sys/sysinfo.h>
#endif
--- dx-4.4.0/configure.ac.r 2006-01-03 22:20:51.000000000 +0100
+++ dx-4.4.0/configure.ac 2006-09-17 03:29:07.000000000 +0200
@@ -1001,7 +1001,7 @@
Xm/ScrolledWP.h Xm/SelectioB.h Xm/SeparatoG.h Xm/SeparatoGP.h Xm/Separator.h
\
Xm/Text.h Xm/TextF.h Xm/ToggleB.h Xm/ToggleBG.h Xm/Xm.h Xm/XmP.h
Xm/XmStrDefs.h \
gl.h gl/device.h gl/gl.h invent.h iop/afb.h iop/mov.h iop/pfs.h license.h \
- linux/kernel.h linux/sys.h math.h mingw32/dir.h mon.h net/if_arp.h
net/route.h \
+ linux/kernel.h math.h mingw32/dir.h mon.h net/if_arp.h net/route.h \
os2.h setjmp.h starbase.c.h stddef.h stdio.h synch.h sys/access.h \
sys/ipc.h sys/m88kbcs.h sys/mman.h sys/mode.h sys/pstat.h sys/resource.h \
sys/svs.h sys/sysconfig.h sys/syslimits.h sys/sysmacros.h ulocks.h
x11/xlibxtra.h \
--- dx-4.4.0/help/Makefile.am.r 2003-07-12 02:11:37.000000000 +0200
+++ dx-4.4.0/help/Makefile.am 2006-09-17 03:29:07.000000000 +0200
@@ -257,7 +257,7 @@
$(LN_S) hlpalhtl svsmstrh ; \
$(LN_S) hlpalhtl ugidx ; \
$(LN_S) hlpalhtl usrefidx ; \
- $(LN_S) HelpDir GarHelpDir ; \
+ $(LN_S) HelpDir GARHelpDir ; \
$(LN_S) HelpDir MBHelpDir ; \
echo "cd $(DESTDIR)$(helpdir)" ; \
echo "$(LN_S) hlpalhtl mbidx" ; \
@@ -265,6 +265,6 @@
echo "$(LN_S) hlpalhtl svsmstrh" ; \
echo "$(LN_S) hlpalhtl ugidx" ; \
echo "$(LN_S) hlpalhtl usrefidx" ; \
- echo "$(LN_S) HelpDir GarHelpDir" ; \
+ echo "$(LN_S) HelpDir GARHelpDir" ; \
echo "$(LN_S) HelpDir MBHelpDir" ) \
'
_______________________________________________
OpenDX2-dev mailing list
[email protected]
https://lists.berlios.de/mailman/listinfo/opendx2-dev
