Hello,
I have dx built, installed and running for linux and solaris
and would like to report 3 problems. The fixes can be found
in the file in attachment (which is the output of "cvs diff -C3").
Please let me know if something is wrong with this.
I hope this will help.
Best regards,
Jose Gomes
-----------------------------------------------------------------------
Following are the three bugs description, labeled i), ii) and iii).
i)
The main problem is that the Makefile.am's are not written
to support both builddir==srcdir and builtdir!=srcdir
which was required for me since I wanted
to compile it for two architectures and which is (as far as I
know) the standard way to use the gnu tools.
So I had to change in almost every Makefile.am's
lines like:
INCLUDES = -I../../../include [EMAIL PROTECTED]@
by lines like:
INCLUDES = -I$(srcdir)/../../../include [EMAIL PROTECTED]@
Another modification is due to the fact that c++ sources are generated
automatically by a script called "class" which asssumed that
srcdir==builddir.
So this script is slightly modified so that it can
be passed the srcdir directory as argument.
See below for a list of the modified files.
ii)
My opengl headers and libraries are not is a standard place.
I added the options --with-gl-includes and --with-gl-libs
to the "configure" script so that these locations can be passed
to all Makefile.am through the variables GL_INCLUDES and GL_LIBS.
See bellow for a list of modified files.
iii)
I have flex installed for solaris and the scripts think that
linux implies flex and solaris implies lex.
The problem is that flex and lex are not compatible.
The file src/uipp/dxuilib/Network.C uses the "yylineno"
variable which does not exists in flex but does in lex.
This was taken into account in this C file by:
#if defined(linux) || defined(cygwin) || defined(freebsd)
int yylineno;
#else
extern int yylineno; /* lexer line number */
#endif
I think it is not the correct test since the fact "yylineno" exists
is just a matter of "lex" or "flex".
So, instead of adding the test "|| defined(solaris)", I hadded the
autoconf variable "HAVE_YYLINENO" (initialized by "configure")
and replace the previous code by:
#ifndef HAVE_YYLINENO
int yylineno;
#else
extern int yylineno; /* lexer line number */
#endif
See below for a list of modified files.
Following are the list of modified files for fixing the 3 bugs.
builddir==srcdir
---------------
M acconfig.h
M configure.in
M src/exec/dpexec/Makefile.am
M src/exec/dpexec/local.mk
M src/exec/dxexec/Makefile.am
M src/exec/dxmods/Makefile.am
M src/exec/hwrender/Makefile.am
M src/exec/hwrender/opengl/Makefile.am
M src/exec/libdx/Makefile.am
M src/exec/libdx/class
M src/exec/libdx/local.mk
M src/misc/Makefile.am
M src/uipp/base/Makefile.am
M src/uipp/dxl/Makefile.am
M src/uipp/dxui/Makefile.am
M src/uipp/dxuilib/Makefile.am
M src/uipp/dxuilib/Network.C
M src/uipp/java/Makefile.am
M src/uipp/mb/Makefile.am
Non standard gl location.
-------------------------
M configure.in
M src/exec/dxexec/Makefile.am
M src/exec/hwrender/Makefile.am
M src/exec/hwrender/opengl/Makefile.am
No yylineno in flex.
--------------------
M acconfig.h
M configure.in
M src/uipp/dxuilib/Network.C
--
[EMAIL PROTECTED] Tel. +33 4 92 38 76 48
http://www.inria.fr/robotvis/personnel/jgomes
Projet RobotVis, INRIA, 2004, route des Lucioles - B.P. 93
F-06902 Sophia Antipolis Cedex, FRANCEIndex: acconfig.h
===================================================================
RCS file: /src/master/dx/acconfig.h,v
retrieving revision 1.24
diff -C3 -r1.24 acconfig.h
*** acconfig.h 1999/12/03 16:23:57 1.24
--- acconfig.h 2000/02/21 09:30:58
***************
*** 23,28 ****
--- 23,29 ----
#undef OLD_LESSTIF
#undef USING_BISON
+ #undef HAVE_YYLINENO
#undef HAVE_SYS_ERRLIST
#undef HAVE_SYSCONFIG_NCPUS
#undef ALTERNATE_CXX_SIGNAL
Index: configure.in
===================================================================
RCS file: /src/master/dx/configure.in,v
retrieving revision 1.112
diff -C3 -r1.112 configure.in
*** configure.in 2000/02/03 19:55:48 1.112
--- configure.in 2000/02/21 09:30:59
***************
*** 2,7 ****
--- 2,8 ----
dnl Start of configuration ----
+ AC_SUBST(LEX)
AC_SUBST(YACC)
AC_SUBST(SHELL)
AC_SUBST(ARCH)
***************
*** 26,31 ****
--- 27,34 ----
AC_SUBST(DXEXEC_IMP)
AC_SUBST(VERSION_STRING)
AC_SUBST(ANYDX)
+ AC_SUBST(GL_INCLUDES)
+ AC_SUBST(GL_LIBS)
AC_SUBST(DXABI)
AC_SUBST(DX_RTL_CFLAGS)
AC_SUBST(DX_RTL_LDFLAGS)
***************
*** 185,190 ****
--- 188,214 ----
with_cosmojar_path=''
fi
+ AC_ARG_WITH(gl-includes,
+ [ --with-gl-includes=DIR set path to OpenGL includes],
+ [with_gl_includes=$withval],
+ [with_gl_includes=''])
+ if test -z "$with_gl_includes"
+ then
+ GL_INCLUDES=''
+ else
+ GL_INCLUDES="-I$with_gl_includes"
+ fi
+
+ AC_ARG_WITH(gl-libs,
+ [ --with-gl-libs=DIR set path to OpenGL libraries],
+ [with_gl_libs=$withval],
+ [with_gl_libs=''])
+ if test -z "$with_gl_libs"
+ then
+ GL_LIBS=''
+ else
+ GL_LIBS="-L$with_gl_libs"
+ fi
dnl End of command line options configuration
***************
*** 887,893 ****
AC_EGREP_HEADER(sys_errlist, stdio.h, AC_DEFINE(HAVE_SYS_ERRLIST))
! dnl Check yaccer. Don't use standard AQC_PROG_YACC... We're going
dnl to create an -D as well as the make variable
AC_CHECK_PROG(yakker, bison, "bison", "yacc")
if test "$yakker" = "bison" ; then
--- 911,917 ----
AC_EGREP_HEADER(sys_errlist, stdio.h, AC_DEFINE(HAVE_SYS_ERRLIST))
! dnl Check yaccer. Don't use standard AC_PROG_YACC... We're going
dnl to create an -D as well as the make variable
AC_CHECK_PROG(yakker, bison, "bison", "yacc")
if test "$yakker" = "bison" ; then
***************
*** 897,904 ****
YACC=yacc
fi
!
!
DX_CHECK_HEADERS( CC/libc.h CC/osfcn.h DPS/XDPSlib.h DPS/dpsXclient.h \
DPS/psops.h GL/gl.h GL/glx.h Mrm/MrmPubli.h X11/Composite.h \
--- 921,932 ----
YACC=yacc
fi
! dnl Check for lex.
! dnl Remark: flex, unlike lex, does not define yylineno.
! AM_PROG_LEX
! if test "$LEX" = "lex"; then
! AC_DEFINE(HAVE_YYLINENO)
! fi
DX_CHECK_HEADERS( CC/libc.h CC/osfcn.h DPS/XDPSlib.h DPS/dpsXclient.h \
DPS/psops.h GL/gl.h GL/glx.h Mrm/MrmPubli.h X11/Composite.h \
***************
*** 1054,1061 ****
src/uipp/dxl/Makefile \
src/uipp/dxui/Makefile \
src/uipp/dxuilib/Makefile \
! src/uipp/java/dx/protocol/server/Makefile \
src/uipp/java/dx/protocol/Makefile \
src/uipp/java/dx/Makefile \
src/uipp/java/dx/runtime/Makefile \
src/uipp/java/server/Makefile \
--- 1082,1091 ----
src/uipp/dxl/Makefile \
src/uipp/dxui/Makefile \
src/uipp/dxuilib/Makefile \
! src/uipp/java/Makefile \
! src/uipp/java/dx/Makefile \
src/uipp/java/dx/protocol/Makefile \
+ src/uipp/java/dx/protocol/server/Makefile \
src/uipp/java/dx/Makefile \
src/uipp/java/dx/runtime/Makefile \
src/uipp/java/server/Makefile \
***************
*** 1069,1074 ****
src/uipp/prompter/Makefile \
src/uipp/startup/Makefile \
src/uipp/tutor/Makefile \
- src/uipp/ui/Makefile \
src/uipp/ui/Makefile \
src/uipp/widgets/Makefile )
--- 1099,1103 ----
Index: help/Makefile.am
===================================================================
RCS file: /src/master/dx/help/Makefile.am,v
retrieving revision 1.10
diff -C3 -r1.10 Makefile.am
*** Makefile.am 2000/02/02 22:54:07 1.10
--- Makefile.am 2000/02/21 09:30:59
***************
*** 6,12 ****
install-data-local:
@sh -c 'if test ! -f $(helpdir)/hlpalhtl ; then \
! f=`pwd` ; \
if test ! -d $(helpdir) ; then \
mkdir $(helpdir) ; \
fi ; \
--- 6,12 ----
install-data-local:
@sh -c 'if test ! -f $(helpdir)/hlpalhtl ; then \
! f=`cd $(srcdir) && pwd` ; \
if test ! -d $(helpdir) ; then \
mkdir $(helpdir) ; \
fi ; \
Index: src/exec/dpexec/Makefile.am
===================================================================
RCS file: /src/master/dx/src/exec/dpexec/Makefile.am,v
retrieving revision 1.14
diff -C3 -r1.14 Makefile.am
*** Makefile.am 1999/11/03 20:25:20 1.14
--- Makefile.am 2000/02/21 09:31:00
***************
*** 1,6 ****
## Process this file with automake to produce Makefile.in
! INCLUDES = -I../../../include -I../libdx [EMAIL PROTECTED]@
noinst_LIBRARIES = libDPEXEC.a
--- 1,6 ----
## Process this file with automake to produce Makefile.in
! INCLUDES = -I$(srcdir)/../../../include -I$(srcdir)/../libdx [EMAIL
PROTECTED]@
noinst_LIBRARIES = libDPEXEC.a
***************
*** 28,34 ****
EXTRA_DIST = local.mk
! $(libDPEXEC_a_SOURCES): yuiif.c yuiif.h
DISTCLEANFILES = yuiif.c yuiif.h
--- 28,34 ----
EXTRA_DIST = local.mk
! $(patsubst %,$(srcdir)/%, $(libDPEXEC_a_SOURCES)): yuiif.c yuiif.h
DISTCLEANFILES = yuiif.c yuiif.h
Index: src/exec/dpexec/local.mk
===================================================================
RCS file: /src/master/dx/src/exec/dpexec/local.mk,v
retrieving revision 1.1
diff -C3 -r1.1 local.mk
*** local.mk 1999/07/09 15:42:59 1.1
--- local.mk 2000/02/21 09:31:00
***************
*** 2,13 ****
SUFFIXES = .m .y .c .s .h .o .a
.y.h:
! $(YACC) $(YFLAGS) -d $*.y
mv y.tab.h $*.h
mv y.tab.c $*.c
.y.c:
! $(YACC) $(YFLAGS) -d $*.y
mv y.tab.h $*.h
mv y.tab.c $*.c
--- 2,13 ----
SUFFIXES = .m .y .c .s .h .o .a
.y.h:
! $(YACC) $(YFLAGS) -d $(srcdir)/$*.y
mv y.tab.h $*.h
mv y.tab.c $*.c
.y.c:
! $(YACC) $(YFLAGS) -d $(srcdir)/$*.y
mv y.tab.h $*.h
mv y.tab.c $*.c
Index: src/exec/dxexec/Makefile.am
===================================================================
RCS file: /src/master/dx/src/exec/dxexec/Makefile.am,v
retrieving revision 1.12
diff -C3 -r1.12 Makefile.am
*** Makefile.am 1999/10/01 18:42:22 1.12
--- Makefile.am 2000/02/21 09:31:01
***************
*** 1,6 ****
## Process this file with automake to produce Makefile.in
! INCLUDES = -I../dpexec [EMAIL PROTECTED]@
[EMAIL PROTECTED]@
EXP=$BUILDBASE/lib/dxexec.exp
--- 1,6 ----
## Process this file with automake to produce Makefile.in
! INCLUDES = -I$(srcdir)/../dpexec [EMAIL PROTECTED]@
[EMAIL PROTECTED]@
EXP=$BUILDBASE/lib/dxexec.exp
***************
*** 26,29 ****
../hwrender/opengl/libOPENGL.a \
-L/usr/X11R6/lib \
-L/usr/local/lib \
! -lm -lGL -lX11 -lXext
--- 26,29 ----
../hwrender/opengl/libOPENGL.a \
-L/usr/X11R6/lib \
-L/usr/local/lib \
! -lm $(GL_LIBS) -lGL -lX11 -lXext
Index: src/exec/dxmods/Makefile.am
===================================================================
RCS file: /src/master/dx/src/exec/dxmods/Makefile.am,v
retrieving revision 1.25
diff -C3 -r1.25 Makefile.am
*** Makefile.am 2000/01/06 21:06:54 1.25
--- Makefile.am 2000/02/21 09:31:01
***************
*** 1,6 ****
## Process this file with automake to produce Makefile.in
! INCLUDES = -I../../../include -I../dpexec -I/usr/include -I/usr/local/include
[EMAIL PROTECTED]@
dxmdfdir = $(prefix)/dx/lib
noinst_LIBRARIES = libDXMODS.a libusercm.a
--- 1,6 ----
## Process this file with automake to produce Makefile.in
! INCLUDES = -I$(srcdir)/../../../include -I$(srcdir)/../dpexec -I/usr/include
-I/usr/local/include [EMAIL PROTECTED]@
dxmdfdir = $(prefix)/dx/lib
noinst_LIBRARIES = libDXMODS.a libusercm.a
***************
*** 106,131 ****
usercm.c: dxcm.mdf
@echo usercm.c rule
! awk -f ../../../lib/mdf2c.awk < dxcm.mdf > usercm.c
user.c: dx.mdf
@echo user.c rule
! awk -f ../../../lib/mdf2c.awk < dx.mdf > user.c
! dxcm.mdf: dxmdf.src
-rm -f dxcm.mdf
! cp dxmdf.src tmp.c
$(CPP) $(MDF) $(DEFS) tmp.c > dxcm.mdf
-rm -f tmp.c
! dx.mdf: dxmdf.src
-rm -f dx.mdf
! cp dxmdf.src tmp.c
$(CPP) $(MDF) $(DEFS) -DCPLUSPLUS_UI -DEXECUTIVE_MODS tmp.c > dx.mdf
-rm -f tmp.c
! y.tab.c: _compparse.y
! $(YACC) -vd _compparse.y
_compparse.c: y.tab.c
sed -e "s/yy/_dxfcc/g" -e "s/YY/_CC/g" y.tab.c > _compparse.c
--- 106,131 ----
usercm.c: dxcm.mdf
@echo usercm.c rule
! awk -f $(srcdir)/../../../lib/mdf2c.awk < dxcm.mdf > usercm.c
user.c: dx.mdf
@echo user.c rule
! awk -f $(srcdir)/../../../lib/mdf2c.awk < dx.mdf > user.c
! dxcm.mdf: $(srcdir)/dxmdf.src
-rm -f dxcm.mdf
! cp $(srcdir)/dxmdf.src tmp.c
$(CPP) $(MDF) $(DEFS) tmp.c > dxcm.mdf
-rm -f tmp.c
! dx.mdf: $(srcdir)/dxmdf.src
-rm -f dx.mdf
! cp $(srcdir)/dxmdf.src tmp.c
$(CPP) $(MDF) $(DEFS) -DCPLUSPLUS_UI -DEXECUTIVE_MODS tmp.c > dx.mdf
-rm -f tmp.c
! y.tab.c: $(srcdir)/_compparse.y
! $(YACC) -vd $<
_compparse.c: y.tab.c
sed -e "s/yy/_dxfcc/g" -e "s/YY/_CC/g" y.tab.c > _compparse.c
Index: src/exec/hwrender/Makefile.am
===================================================================
RCS file: /src/master/dx/src/exec/hwrender/Makefile.am,v
retrieving revision 1.8
diff -C3 -r1.8 Makefile.am
*** Makefile.am 1999/05/03 14:06:39 1.8
--- Makefile.am 2000/02/21 09:31:01
***************
*** 2,8 ****
SUBDIRS = opengl gl xgl starbase
! INCLUDES = -I../../../include -I../libdx -I/usr/include -I/usr/local/include
[EMAIL PROTECTED]@
noinst_LIBRARIES = libHW.a
--- 2,8 ----
SUBDIRS = opengl gl xgl starbase
! INCLUDES = -I$(srcdir)/../../../include -I$(srcdir)/../libdx -I/usr/include
-I/usr/local/include $(GL_INCLUDES) [EMAIL PROTECTED]@
noinst_LIBRARIES = libHW.a
Index: src/exec/hwrender/opengl/Makefile.am
===================================================================
RCS file: /src/master/dx/src/exec/hwrender/opengl/Makefile.am,v
retrieving revision 1.8
diff -C3 -r1.8 Makefile.am
*** Makefile.am 1999/07/15 15:23:10 1.8
--- Makefile.am 2000/02/21 09:31:01
***************
*** 1,6 ****
## Process this file with automake to produce Makefile.in
! INCLUDES = -I../../../../include -I.. -I../../libdx -I/usr/include
-I/usr/local/include [EMAIL PROTECTED]@
noinst_LIBRARIES = libOPENGL.a
--- 1,6 ----
## Process this file with automake to produce Makefile.in
! INCLUDES = -I$(srcdir)/../../../../include -I$(srcdir)/..
-I$(srcdir)/../../libdx -I/usr/include -I/usr/local/include $(GL_INCLUDES)
[EMAIL PROTECTED]@
noinst_LIBRARIES = libOPENGL.a
Index: src/exec/libdx/Makefile.am
===================================================================
RCS file: /src/master/dx/src/exec/libdx/Makefile.am,v
retrieving revision 1.31
diff -C3 -r1.31 Makefile.am
*** Makefile.am 1999/12/15 06:34:46 1.31
--- Makefile.am 2000/02/21 09:31:02
***************
*** 1,6 ****
## Process this file with automake to produce Makefile.in
! INCLUDES = -I../../../include [EMAIL PROTECTED]@
dxlibdir = $(prefix)/dx/[EMAIL PROTECTED]@
--- 1,6 ----
## Process this file with automake to produce Makefile.in
! INCLUDES = -I$(srcdir)/../../../include [EMAIL PROTECTED]@
dxlibdir = $(prefix)/dx/[EMAIL PROTECTED]@
***************
*** 128,138 ****
include local.mk
! zclipQ.o: zclipQ.c
! $(COMPILE) -c -O zclipQ.c
! zclipT.o: zclipT.c
! $(COMPILE) -c -O zclipT.c
all: .cvsignore
--- 128,138 ----
include local.mk
! zclipQ.o: $(srcdir)/zclipQ.c
! $(COMPILE) -c -O $<
! zclipT.o: $(srcdir)/zclipT.c
! $(COMPILE) -c -O $<
all: .cvsignore
Index: src/exec/libdx/class
===================================================================
RCS file: /src/master/dx/src/exec/libdx/class,v
retrieving revision 1.3
diff -C3 -r1.3 class
*** class 1999/04/16 20:05:55 1.3
--- class 2000/02/21 09:31:02
***************
*** 16,28 ****
# Check/get arguments
#
! if [ $# != 2 ]; then
! echo "Usage: $0 -ch file" 1>&2
exit 1
fi
flag=$1
! file=$2
#
--- 16,29 ----
# Check/get arguments
#
! if [ $# != 3 ]; then
! echo "Usage: $0 -ch dir file" 1>&2
exit 1
fi
flag=$1
! dir=$2
! file=$3
#
***************
*** 39,48 ****
}
include() {
! incl=`sed -n -e "/^INCLUDE[ \t]*\(.*\)/s//\1/p" <$1`
if [ -n "$incl" ]; then
! (include $incl)
! out $incl
fi
}
--- 40,49 ----
}
include() {
! incl=`awk '/^INCLUDE/ {print \$2}' < $1`
if [ -n "$incl" ]; then
! (include $dir/$incl)
! out $dir/$incl
fi
}
***************
*** 65,72 ****
# they would still be processed by the C compiler.
#
if [ $flag = "-c" ]; then
! (echo "#do_h"; include $file; echo "#do_c"; out $file) | awk -f class.awk
elif [ $flag = "-h" ]; then
! (echo "#do_h"; include $file; out $file) | awk -f class.awk
fi
--- 66,82 ----
# they would still be processed by the C compiler.
#
+ # The awk script is stored in the same directory as this sh script.
+ # But since this sh script can be invoked from another directory,
+ # it is necessary to compute the awk script location at
+ # run time (this is the variable awkscript).
+ # In particular, the fact that the sh script "class" is invoked
+ # from another directory is true when builtdir!=srcdir.
+
+ awkscript="`dirname $0`/class.awk"
+
if [ $flag = "-c" ]; then
! (echo "#do_h"; include $dir/$file; echo "#do_c"; out $dir/$file) | awk -f
$awkscript
elif [ $flag = "-h" ]; then
! (echo "#do_h"; include $dir/$file; out $dir/$file) | awk -f $awkscript
fi
Index: src/exec/libdx/local.mk
===================================================================
RCS file: /src/master/dx/src/exec/libdx/local.mk,v
retrieving revision 1.1
diff -C3 -r1.1 local.mk
*** local.mk 1999/07/09 13:13:57 1.1
--- local.mk 2000/02/21 09:31:02
***************
*** 1,25 ****
SUFFIXES = .X .Z .h .m .c .o .s .i
! .X.h: class.awk
rm -f $*.h
! sh ./class -h $*.X >$*.h
! .X.c: class.awk
rm -f $*.c
! sh ./class -c $*.X > $*.c
! buffer.c: buffer.Z
! sed -e 's/[ ][ ]*\$$/ $$/' buffer.Z > __buffer.c
! $(CPP) __buffer.c \
| tr -s "\044" "\012" \
| sed -e '/^#/d' \
-e 's/INCLUDE2/#include/' \
-e 's/^pragma/#pragma/' > buffer.c
rm -f __buffer.c
! shade.c: shade.Z
! sed -e 's/[ ][ ]*\$$/ $$/' shade.Z > __shade_.c
! $(CPP) __shade_.c \
| tr -s "\044" "\012" \
| sed -e '/^#/d' \
-e 's/DEFINE2/#define/' \
--- 1,25 ----
SUFFIXES = .X .Z .h .m .c .o .s .i
! .X.h: $(srcdir)/class.awk
rm -f $*.h
! sh $(srcdir)/class -h $(srcdir) $*.X >$*.h
! .X.c: $(srcdir)/class.awk
rm -f $*.c
! sh $(srcdir)/class -c $(srcdir) $*.X > $*.c
! buffer.c: $(srcdir)/buffer.Z
! sed -e 's/[ ][ ]*\$$/ $$/' $< > __buffer.c
! $(CPP) -I$(srcdir) __buffer.c \
| tr -s "\044" "\012" \
| sed -e '/^#/d' \
-e 's/INCLUDE2/#include/' \
-e 's/^pragma/#pragma/' > buffer.c
rm -f __buffer.c
! shade.c: $(srcdir)/shade.Z
! sed -e 's/[ ][ ]*\$$/ $$/' $< > __shade_.c
! $(CPP) -I$(srcdir) __shade_.c \
| tr -s "\044" "\012" \
| sed -e '/^#/d' \
-e 's/DEFINE2/#define/' \
***************
*** 27,43 ****
-e 's/[^#]pragma/#pragma/' > shade.c
rm -f __shade_.c
! triangle.c: triangle.Z
! sed -e 's/[ ][ ]*\$$/ $$/' triangle.Z > __triangle.c
! $(CPP) -DPASS1 __triangle.c \
| sed -e '/^#/d' \
-e 's/INCLUDE1/#include/' \
| tr -s "\044" "\012" > triangle1.c
! $(CPP) -DPASS2 triangle1.c \
| sed -e '/^#/d' \
-e 's/INCLUDE2/#include/' \
| tr -s "\044" "\012" > triangle2.c
! $(CPP) -DPASS3 triangle2.c \
| tr -s "\044" "\012" \
| sed -e '/^#/d' \
-e 's/DEFINE3/#define/' \
--- 27,43 ----
-e 's/[^#]pragma/#pragma/' > shade.c
rm -f __shade_.c
! triangle.c: $(srcdir)/triangle.Z
! sed -e 's/[ ][ ]*\$$/ $$/' $< > __triangle.c
! $(CPP) -I$(srcdir) -DPASS1 __triangle.c \
| sed -e '/^#/d' \
-e 's/INCLUDE1/#include/' \
| tr -s "\044" "\012" > triangle1.c
! $(CPP) -I$(srcdir) -DPASS2 triangle1.c \
| sed -e '/^#/d' \
-e 's/INCLUDE2/#include/' \
| tr -s "\044" "\012" > triangle2.c
! $(CPP) -I$(srcdir) -DPASS3 triangle2.c \
| tr -s "\044" "\012" \
| sed -e '/^#/d' \
-e 's/DEFINE3/#define/' \
***************
*** 45,61 ****
-e 's/[^#]pragma/#pragma/' > triangle.c
rm triangle1.c triangle2.c __triangle.c
! quad.c: quad.Z
! sed -e 's/[ ][ ]*\$$/ $$/' quad.Z > __quad.c
! $(CPP) -DPASS1 __quad.c \
| sed -e '/^#/d' \
-e 's/INCLUDE1/#include/' \
| tr -s "\044" "\012" > quad1.c
! $(CPP) -DPASS2 quad1.c \
| sed -e '/^#/d' \
-e 's/INCLUDE2/#include/' \
| tr -s "\044" "\012" > quad2.c
! $(CPP) -DPASS3 quad2.c \
| tr -s "\044" "\012" \
| sed -e '/^#/d' \
-e 's/DEFINE3/#define/' \
--- 45,61 ----
-e 's/[^#]pragma/#pragma/' > triangle.c
rm triangle1.c triangle2.c __triangle.c
! quad.c: $(srcdir)/quad.Z
! sed -e 's/[ ][ ]*\$$/ $$/' $< > __quad.c
! $(CPP) -I$(srcdir) -DPASS1 __quad.c \
| sed -e '/^#/d' \
-e 's/INCLUDE1/#include/' \
| tr -s "\044" "\012" > quad1.c
! $(CPP) -I$(srcdir) -DPASS2 quad1.c \
| sed -e '/^#/d' \
-e 's/INCLUDE2/#include/' \
| tr -s "\044" "\012" > quad2.c
! $(CPP) -I$(srcdir) -DPASS3 quad2.c \
| tr -s "\044" "\012" \
| sed -e '/^#/d' \
-e 's/DEFINE3/#define/' \
***************
*** 63,71 ****
-e 's/[^#]pragma/#pragma/' > quad.c
rm quad1.c quad2.c __quad.c
! plane.c: plane.Z
! cp plane.Z _plane.c
! $(CPP) _plane.c \
| tr -s "\044" "\012" \
| sed -e '/^#/d' \
-e 's/INCLUDE2/#include/' \
--- 63,71 ----
-e 's/[^#]pragma/#pragma/' > quad.c
rm quad1.c quad2.c __quad.c
! plane.c: $(srcdir)/plane.Z
! cp $< _plane.c
! $(CPP) -I$(srcdir) _plane.c \
| tr -s "\044" "\012" \
| sed -e '/^#/d' \
-e 's/INCLUDE2/#include/' \
Index: src/misc/Makefile.am
===================================================================
RCS file: /src/master/dx/src/misc/Makefile.am,v
retrieving revision 1.7
diff -C3 -r1.7 Makefile.am
*** Makefile.am 2000/01/17 22:52:31 1.7
--- Makefile.am 2000/02/21 09:31:02
***************
*** 1,6 ****
## Process this file with automake to produce Makefile.in
! INCLUDES = -I../../include
dxbindir = $(prefix)/bin
noinst_PROGRAMS = dxlocal
--- 1,6 ----
## Process this file with automake to produce Makefile.in
! INCLUDES = -I$(srcdir)/../../include
dxbindir = $(prefix)/bin
noinst_PROGRAMS = dxlocal
Index: src/uipp/base/Makefile.am
===================================================================
RCS file: /src/master/dx/src/uipp/base/Makefile.am,v
retrieving revision 1.7
diff -C3 -r1.7 Makefile.am
*** Makefile.am 1999/09/01 21:27:26 1.7
--- Makefile.am 2000/02/21 09:31:02
***************
*** 1,6 ****
## Process this file with automake to produce Makefile.in
! INCLUDES = -I../widgets -I../../../include [EMAIL PROTECTED]@
noinst_LIBRARIES = libBASE.a
--- 1,6 ----
## Process this file with automake to produce Makefile.in
! INCLUDES = -I$(srcdir)/../widgets -I$(srcdir)/../../../include [EMAIL
PROTECTED]@
noinst_LIBRARIES = libBASE.a
Index: src/uipp/dxl/Makefile.am
===================================================================
RCS file: /src/master/dx/src/uipp/dxl/Makefile.am,v
retrieving revision 1.12
diff -C3 -r1.12 Makefile.am
*** Makefile.am 1999/05/03 14:08:43 1.12
--- Makefile.am 2000/02/21 09:31:03
***************
*** 1,6 ****
## Process this file with automake to produce Makefile.in
! INCLUDES = -I../../../include [EMAIL PROTECTED]@
dxlibdir = $(prefix)/dx/[EMAIL PROTECTED]@
--- 1,6 ----
## Process this file with automake to produce Makefile.in
! INCLUDES = -I$(srcdir)/../../../include [EMAIL PROTECTED]@
dxlibdir = $(prefix)/dx/[EMAIL PROTECTED]@
Index: src/uipp/dxui/Makefile.am
===================================================================
RCS file: /src/master/dx/src/uipp/dxui/Makefile.am,v
retrieving revision 1.13
diff -C3 -r1.13 Makefile.am
*** Makefile.am 1999/09/01 21:27:44 1.13
--- Makefile.am 2000/02/21 09:31:03
***************
*** 1,6 ****
! INCLUDES = -I../base -I../../../include -I../dxuilib [EMAIL PROTECTED]@
dxbindir = $(prefix)/dx/[EMAIL PROTECTED]@
dxbin_PROGRAMS = dxui
--- 1,6 ----
! INCLUDES = -I$(srcdir)/../base -I$(srcdir)/../../../include
-I$(srcdir)/../dxuilib [EMAIL PROTECTED]@
dxbindir = $(prefix)/dx/[EMAIL PROTECTED]@
dxbin_PROGRAMS = dxui
Index: src/uipp/dxuilib/Makefile.am
===================================================================
RCS file: /src/master/dx/src/uipp/dxuilib/Makefile.am,v
retrieving revision 1.17
diff -C3 -r1.17 Makefile.am
*** Makefile.am 1999/11/03 20:25:23 1.17
--- Makefile.am 2000/02/21 09:31:03
***************
*** 1,6 ****
## Process this file with automake to produce Makefile.in
! INCLUDES = -I../base -I../../../include -I../dxui [EMAIL PROTECTED]@
noinst_LIBRARIES = libDXUI.a
--- 1,6 ----
## Process this file with automake to produce Makefile.in
! INCLUDES = -I$(srcdir)/../base -I$(srcdir)/../../../include
-I$(srcdir)/../dxui [EMAIL PROTECTED]@
noinst_LIBRARIES = libDXUI.a
***************
*** 397,409 ****
libDXUI_a_SOURCES = $(SRCS1) $(SRCS2) $(SRCS3) $(SRCS4) $(SRCS5)
! sequence.txt: sequence.net
! sed -e 's/"/\\"/g' sequence.net | \
sed -e 's/$$/\\n"/g' | \
sed -e 's/^/"/g' > sequence.txt
gifmac.txt:
! grep -h -v // ../java/dx/server/gifmac.net | \
grep -v include | \
grep -v "= NULL" | \
sed -e 's/"/\\"/g' | \
--- 397,409 ----
libDXUI_a_SOURCES = $(SRCS1) $(SRCS2) $(SRCS3) $(SRCS4) $(SRCS5)
! sequence.txt: $(srcdir)/sequence.net
! sed -e 's/"/\\"/g' $< | \
sed -e 's/$$/\\n"/g' | \
sed -e 's/^/"/g' > sequence.txt
gifmac.txt:
! grep -h -v // $(srcdir)/../java/dx/server/gifmac.net | \
grep -v include | \
grep -v "= NULL" | \
sed -e 's/"/\\"/g' | \
***************
*** 415,421 ****
sed -e 's/$$/",/' > gifmac.txt
vrmlmac.txt:
! grep -h -v // ../java/dx/server/vrmlmac.net | \
grep -v include | \
grep -v "= NULL" | \
sed -e 's/"/\\"/g' | \
--- 415,421 ----
sed -e 's/$$/",/' > gifmac.txt
vrmlmac.txt:
! grep -h -v // $(srcdir)/../java/dx/server/vrmlmac.net | \
grep -v include | \
grep -v "= NULL" | \
sed -e 's/"/\\"/g' | \
***************
*** 427,433 ****
sed -e 's/$$/",/' > vrmlmac.txt
dxmac.txt:
! grep -h -v // ../java/dx/server/dxmac.net | \
grep -v include | \
grep -v "= NULL" | \
sed -e 's/"/\\"/g' | \
--- 427,433 ----
sed -e 's/$$/",/' > vrmlmac.txt
dxmac.txt:
! grep -h -v // $(srcdir)/../java/dx/server/dxmac.net | \
grep -v include | \
grep -v "= NULL" | \
sed -e 's/"/\\"/g' | \
***************
*** 438,445 ****
sed -e 's/^/"/' | \
sed -e 's/$$/",/' > dxmac.txt
! imagemac.txt: imagemac.net
! grep -h -v // imagemac.net | \
grep -v include | \
grep -v "= NULL" | \
sed -e 's/"/\\"/g' | \
--- 438,445 ----
sed -e 's/^/"/' | \
sed -e 's/$$/",/' > dxmac.txt
! imagemac.txt: $(srcdir)/imagemac.net
! grep -h -v // $< | \
grep -v include | \
grep -v "= NULL" | \
sed -e 's/"/\\"/g' | \
***************
*** 454,465 ****
sed -e 's/^/"/' | \
sed -e 's/$$/",/' > imagemac.txt
! netlex.c: net.lex
! $(LEX) net.lex
mv lex.yy.c netlex.c
! netyacc.c: net.yacc netlex.c netyacc.awk
! $(YACC) net.yacc
! awk -f netyacc.awk y.tab.c > netyacc.c
rm -f y.tab.c
--- 454,465 ----
sed -e 's/^/"/' | \
sed -e 's/$$/",/' > imagemac.txt
! netlex.c: $(srcdir)/net.lex
! $(LEX) $<
mv lex.yy.c netlex.c
! netyacc.c: $(srcdir)/net.yacc netlex.c $(srcdir)/netyacc.awk
! $(YACC) $<
! awk -f $(srcdir)/netyacc.awk y.tab.c > netyacc.c
rm -f y.tab.c
Index: src/uipp/dxuilib/Network.C
===================================================================
RCS file: /src/master/dx/src/uipp/dxuilib/Network.C,v
retrieving revision 1.14
diff -C3 -r1.14 Network.C
*** Network.C 1999/12/15 19:52:51 1.14
--- Network.C 2000/02/21 09:31:06
***************
*** 1190,1196 ****
extern
FILE* yyin; /* parser input stream */
! #if defined(linux) || defined(cygwin) || defined(freebsd)
int yylineno;
#else
extern int yylineno; /* lexer line number */
--- 1190,1196 ----
extern
FILE* yyin; /* parser input stream */
! #ifndef HAVE_YYLINENO
int yylineno;
#else
extern int yylineno; /* lexer line number */
Index: src/uipp/java/Makefile.am
===================================================================
RCS file: /src/master/dx/src/uipp/java/Makefile.am,v
retrieving revision 1.25
diff -C3 -r1.25 Makefile.am
*** Makefile.am 2000/02/01 19:28:01 1.25
--- Makefile.am 2000/02/21 09:31:07
***************
*** 34,52 ****
##
# got to merge these in configure where we can use logic to trim the number
of colons appropriately
! CLASSPATH = @JDK_CLASSPATH@:@WRL_CLASSPATH@:./
export CLASSPATH
dx.jar: makeall.java $(DX_SRCS)
mkdir -p classes
! -($(JAVAC) -d classes makewrl.java )
! ($(JAVAC) -d classes makeall.java $(DX_SRCS) )
(cd classes; $(JAR) cf ../dx.jar $(DX_OBJS) dx)
server.jar: dx.jar DXServer.java
mkdir -p dxsc
! ($(JAVAC) -d dxsc DXServer.java)
(cd dxsc; $(JAR) cf ../server.jar DXServer.class server dx )
SHRD_FLAGS = -shared -o libAnyDX.so
--- 34,52 ----
##
# got to merge these in configure where we can use logic to trim the number
of colons appropriately
! CLASSPATH = $(srcdir)/.:@JDK_CLASSPATH@:@WRL_CLASSPATH@:./
export CLASSPATH
dx.jar: makeall.java $(DX_SRCS)
mkdir -p classes
! -($(JAVAC) -d classes $(srcdir)/makewrl.java )
! ($(JAVAC) -d classes $(srcdir)/makeall.java $(DX_SRCS) )
(cd classes; $(JAR) cf ../dx.jar $(DX_OBJS) dx)
server.jar: dx.jar DXServer.java
mkdir -p dxsc
! ($(JAVAC) -d dxsc $(srcdir)/DXServer.java)
(cd dxsc; $(JAR) cf ../server.jar DXServer.class server dx )
SHRD_FLAGS = -shared -o libAnyDX.so
***************
*** 74,80 ****
DXLink.o: server.jar
(cd dxsc; $(JAVAH) -d ../server server.DXServer server.DXServerThread)
! (cd server; $(CC) $(DXABI) -o ../DXLink.o -I../../../../include -c
[EMAIL PROTECTED]@ $(JNI_CFLAGS) @JINC@ DXLink.c)
##SAMPLE_OBJS = AS400VSMonth.class AutoInsurance.class CCNet2.class \
## GroceryList.class HomeOwn.class MRI_2.class MappedIso.class \
--- 74,80 ----
DXLink.o: server.jar
(cd dxsc; $(JAVAH) -d ../server server.DXServer server.DXServerThread)
! (cd server; $(CC) $(DXABI) -o ../DXLink.o -I../../../../include
-I../$(srcdir)/server/../../../../include -I. -c [EMAIL PROTECTED]@
$(JNI_CFLAGS) @JINC@ ../$(srcdir)/server/DXLink.c)
##SAMPLE_OBJS = AS400VSMonth.class AutoInsurance.class CCNet2.class \
## GroceryList.class HomeOwn.class MRI_2.class MappedIso.class \
Index: src/uipp/mb/Makefile.am
===================================================================
RCS file: /src/master/dx/src/uipp/mb/Makefile.am,v
retrieving revision 1.13
diff -C3 -r1.13 Makefile.am
*** Makefile.am 1999/05/03 14:08:58 1.13
--- Makefile.am 2000/02/21 09:31:08
***************
*** 1,6 ****
## Process this file with automake to produce Makefile.in
! INCLUDES = -I../../../include -I../base -I../widgets [EMAIL PROTECTED]@
dxbindir = $(prefix)/dx/[EMAIL PROTECTED]@
--- 1,6 ----
## Process this file with automake to produce Makefile.in
! INCLUDES = -I$(srcdir)/../../../include -I$(srcdir)/../base
-I$(srcdir)/../widgets [EMAIL PROTECTED]@
dxbindir = $(prefix)/dx/[EMAIL PROTECTED]@
Index: src/uipp/prompter/Makefile.am
===================================================================
RCS file: /src/master/dx/src/uipp/prompter/Makefile.am,v
retrieving revision 1.5
diff -C3 -r1.5 Makefile.am
*** Makefile.am 1999/05/03 14:08:59 1.5
--- Makefile.am 2000/02/21 09:31:08
***************
*** 1,6 ****
## Process this file with automake to produce Makefile.in
! INCLUDES = -I../base -I../../../include [EMAIL PROTECTED]@
dxbindir = $(prefix)/dx/[EMAIL PROTECTED]@
--- 1,6 ----
## Process this file with automake to produce Makefile.in
! INCLUDES = -I$(srcdir)/../base -I$(srcdir)/../../../include [EMAIL
PROTECTED]@
dxbindir = $(prefix)/dx/[EMAIL PROTECTED]@
Index: src/uipp/startup/Makefile.am
===================================================================
RCS file: /src/master/dx/src/uipp/startup/Makefile.am,v
retrieving revision 1.12
diff -C3 -r1.12 Makefile.am
*** Makefile.am 1999/05/03 14:08:59 1.12
--- Makefile.am 2000/02/21 09:31:08
***************
*** 1,6 ****
## Process this file with automake to produce Makefile.in
! INCLUDES = -I../../../include -I../base [EMAIL PROTECTED]@
dxbindir = $(prefix)/dx/[EMAIL PROTECTED]@
--- 1,6 ----
## Process this file with automake to produce Makefile.in
! INCLUDES = -I$(srcdir)/../../../include -I$(srcdir)/../base [EMAIL
PROTECTED]@
dxbindir = $(prefix)/dx/[EMAIL PROTECTED]@
Index: src/uipp/tutor/Makefile.am
===================================================================
RCS file: /src/master/dx/src/uipp/tutor/Makefile.am,v
retrieving revision 1.12
diff -C3 -r1.12 Makefile.am
*** Makefile.am 1999/05/03 14:09:00 1.12
--- Makefile.am 2000/02/21 09:31:09
***************
*** 1,6 ****
## Process this file with automake to produce Makefile.in
! INCLUDES = -I../../../include -I../base [EMAIL PROTECTED]@
dxbindir = $(prefix)/dx/[EMAIL PROTECTED]@
--- 1,6 ----
## Process this file with automake to produce Makefile.in
! INCLUDES = -I$(srcdir)/../../../include -I$(srcdir)/../base [EMAIL PROTECTED]@
dxbindir = $(prefix)/dx/[EMAIL PROTECTED]@
Index: src/uipp/widgets/Makefile.am
===================================================================
RCS file: /src/master/dx/src/uipp/widgets/Makefile.am,v
retrieving revision 1.9
diff -C3 -r1.9 Makefile.am
*** Makefile.am 1999/05/03 14:09:01 1.9
--- Makefile.am 2000/02/21 09:31:09
***************
*** 1,6 ****
## Process this file with automake to produce Makefile.in
! INCLUDES = -I../widgets [EMAIL PROTECTED]@
noinst_LIBRARIES = libWIDGETS.a
--- 1,6 ----
## Process this file with automake to produce Makefile.in
! INCLUDES = -I$(srcdir)/../widgets [EMAIL PROTECTED]@
noinst_LIBRARIES = libWIDGETS.a
