[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Nel] NeL Debian GNU/Linux unstable package
|
From: |
Loic Dachary |
|
Subject: |
[Nel] NeL Debian GNU/Linux unstable package |
|
Date: |
Sat, 9 Mar 2002 12:12:16 +0100 |
Hi,
I generated a Debian GNU/Linux package for NeL, you will find
it at http://loic.dachary.org/nel/. If this is more convenient for
Nevrax people, I can arrange for this directory to respond to rsync so
that a mirror can be done on nevrax.org.
I had to fix a few things so that make dist generates a proper
distribution. Here is a summary of what the patch does:
- fix a few spelling errors in INSTALL
- added bootstrap doc samples and tools to the distribution
- killed all CVS directories in the generated distribution
- reworked the acinclude.m4 stlport macro so that it detects a
standard stlport installation, barks if --without-stlport is
specified, allow --with-stlport-lib without a --with-stlport,
uses AC_LANG macros
- add ${top_srcdir}/include to the include list so that building
in a directory other than the source directory works (needed
for make distcheck)
- added DIST_SUBDIRS so that make dist is aware of the complete
list of subdirectories to include in the distribution even when
@NEL_SUBDIRS@ is used
- fix numerous Makefile.am that were lacking headers (did not
make it thru the distribution)
- recommend stlport-4.5 instead of stlport-4.0
The patch is generated against todays CVS tree.
Cheers,
Index: nel/INSTALL
===================================================================
RCS file: /home/cvsroot/code/nel/INSTALL,v
retrieving revision 1.21
diff -u -r1.21 INSTALL
--- nel/INSTALL 7 Feb 2002 16:52:12 -0000 1.21
+++ nel/INSTALL 9 Mar 2002 11:05:35 -0000
@@ -2,15 +2,15 @@
Requirements
============
- The NeL library need the following libraries :
+ The NeL library needs the following libraries :
- - STLPort 4.0 <URL:http://www.stlport.org/> (Mandatory)
+ - STLPort 4.5 <URL:http://www.stlport.org/> (Mandatory)
- LibXML 2.4.13 <URL:http://www.xmlsoft.org/> (NeL Misc)
- FreeType 2 <URL:http://freetype.sourceforge.net/> (NeL 3D)
- OpenAL <URL:http://www.openal.org/> (NeL Sound)
- Python 1.5 <URL:http://www.python.org/> (NeL AI)
- STLPort need to be compiled. NeL is using the SGI iostreams and it require
+ STLPort needs to be compiled. NeL is using the SGI iostreams and it require
the STLPort compilation and a linking of NeL with the STLPort library.
On a GNU/Linux platform you will need the following libraries and
@@ -43,7 +43,7 @@
provided on your installation disk.
The given sofware or library version numbers are the ones that we are
- using. We don't know if it working with other (older or more recent)
+ using. We don't know if NeL will work with other (older or more recent)
versions of these softwares or libraries. You are welcome to help us
to define more precisely these informations ;-)
@@ -91,10 +91,10 @@
The STLPort include *must* be inserted before the microsoft one or
the compiler will take microsoft STL instead of STLPort STL.
(use the arrow button to put the STLPort include at the top)
- ex: D:/stlport-4.0/stlport
+ ex: D:/stlport-4.5/stlport
- Add the STLPort library directory to the "Library Files" category.
- ex: D:/stlport-4.0/lib
+ ex: D:/stlport-4.5/lib
- Add the FreeType include directory to the "Include Files" category.
ex: D:/freetype-2.0/include
Index: nel/Makefile.am
===================================================================
RCS file: /home/cvsroot/code/nel/Makefile.am,v
retrieving revision 1.7
diff -u -r1.7 Makefile.am
--- nel/Makefile.am 7 Jan 2002 16:09:52 -0000 1.7
+++ nel/Makefile.am 9 Mar 2002 11:05:35 -0000
@@ -14,14 +14,10 @@
bin_SCRIPTS = nel-config
-EXTRA_DIST = nel.dsw
+EXTRA_DIST = nel.dsw bootstrap doc samples tools
dist-hook:
- cp -p $(srcdir)/bootstrap $(distdir)
- cp -pR $(srcdir)/doc $(distdir)
- cp -pR $(srcdir)/samples $(distdir)
- cp -pR $(srcdir)/tools $(distdir)
-
+ find $(distdir) -name CVS -print | xargs rm -fr
# End of Makefile.am
Index: nel/acinclude.m4
===================================================================
RCS file: /home/cvsroot/code/nel/acinclude.m4,v
retrieving revision 1.8
diff -u -r1.8 acinclude.m4
--- nel/acinclude.m4 18 Feb 2002 12:58:38 -0000 1.8
+++ nel/acinclude.m4 9 Mar 2002 11:05:35 -0000
@@ -374,11 +374,10 @@
if test "$with_stlport" = no
then
dnl The user explicitly disabled the use of the STLPorts
- AC_MSG_CHECKING(STLPort)
- have_stlport="disabled"
- AC_MSG_RESULT(disabled (*** EXPERIMENTAL ***))
+ AC_MSG_ERROR([STLPort is mandatory: do not specify --without-stlport])
else
- if test "$with_stlport"
+ stlport_includes="/usr/include/stlport"
+ if test "$with_stlport" -a "$with_stlport" != yes
then
stlport_includes="$with_stlport/stlport"
stlport_libraries="$with_stlport/lib"
@@ -390,82 +389,73 @@
fi
fi
-if test -z "$have_stlport" -a "$with_stlport_include"
+if test "$with_stlport_include"
then
stlport_includes="$with_stlport_include"
fi
-if test -z "$have_stlport" -a "$with_stlport_lib"
+if test "$with_stlport_lib"
then
stlport_libraries="$with_stlport_lib"
fi
-if test -z "$have_stlport"
-then
- dnl Put STLPorts includes in CXXFLAGS
- if test "$stlport_includes"
- then
- CXXFLAGS="$CXXFLAGS -I$stlport_includes"
- fi
-
- dnl Put STLPorts libraries in LIBS
- if test "$stlport_libraries"
- then
- LIBS="-L$stlport_libraries $LIBS -l$stlport_lib"
- fi
-
- dnl Test the headers
- AC_MSG_CHECKING(for STLPort headers)
-
- _CPPFLAGS="$CPPFLAGS"
+AC_LANG_SAVE
+AC_LANG_CPLUSPLUS
- CPPFLAGS="$CXXFLAGS"
+dnl Put STLPorts includes in CXXFLAGS
+if test "$stlport_includes"
+then
+ CXXFLAGS="$CXXFLAGS -I$stlport_includes"
+fi
- AC_EGREP_CPP( yo_stlport,
- [#include <algorithm>
-#ifdef __SGI_STL_PORT
- yo_stlport
-#endif],
- have_stlport_headers="yes",
- have_stlport_headers="no" )
+dnl Put STLPorts libraries directory in LIBS
+if test "$stlport_libraries"
+then
+ LIBS="-L$stlport_libraries $LIBS"
+else
+ stlport_libraries='default'
+fi
- if test "$have_stlport_headers" = "yes"
- then
- AC_MSG_RESULT([$stlport_includes])
- else
- AC_MSG_RESULT(no)
- fi
+dnl Test the headers
- dnl Test the libraries
- AC_MSG_CHECKING(for STLPort libraries)
+AC_CHECK_HEADER(algorithm,
+ have_stlport_headers="yes",
+ have_stlport_headers="no" )
- CPPFLAGS="$CXXFLAGS $LIBS"
+AC_MSG_CHECKING(for STLPort headers)
- AC_TRY_LINK( , , have_stlport_libraries="yes", have_stlport_libraries="no")
+if test "$have_stlport_headers" = "yes"
+then
+ AC_MSG_RESULT([$stlport_includes])
+else
+ AC_MSG_RESULT(no)
+fi
- CPPFLAGS="$_CPPFLAGS"
+AC_CHECK_LIB($stlport_lib, main, have_stlport_libraries="yes",
have_stlport_libraries="no")
- if test "$have_stlport_libraries" = "yes"
- then
- AC_MSG_RESULT([$stlport_libraries])
- else
- AC_MSG_RESULT(no)
- fi
+AC_MSG_CHECKING(for STLPort library)
- if test "$have_stlport_headers" = "yes" \
- && test "$have_stlport_libraries" = "yes"
- then
- have_stlport="yes"
- else
- have_stlport="no"
- fi
+if test "$have_stlport_libraries" = "yes"
+then
+ AC_MSG_RESULT([$stlport_libraries])
+else
+ AC_MSG_RESULT(no)
+fi
- if test "$have_stlport" = "no"
- then
- AC_MSG_ERROR([STLPort must be installed (http://www.stlport.org).])
- fi
+if test "$have_stlport_headers" = "yes" &&
+ test "$have_stlport_libraries" = "yes"
+then
+ have_stlport="yes"
+else
+ have_stlport="no"
+fi
+if test "$have_stlport" = "no"
+then
+ AC_MSG_ERROR([STLPort must be installed (http://www.stlport.org).])
fi
+
+AC_LANG_RESTORE
])
Index: nel/configure.in
===================================================================
RCS file: /home/cvsroot/code/nel/configure.in,v
retrieving revision 1.59
diff -u -r1.59 configure.in
--- nel/configure.in 28 Jan 2002 15:22:19 -0000 1.59
+++ nel/configure.in 9 Mar 2002 11:05:36 -0000
@@ -254,6 +254,10 @@
AM_PATH_XF86VIDMODE
+dnl Arrange for the include directory to be in the search path even when
+dnl build is done outside the source tree
+CFLAGS="$CFLAGS -I\${top_srcdir}/include"
+CXXFLAGS="$CXXFLAGS -I\${top_srcdir}/include"
dnl ====================================================================
dnl Checks for library functions.
@@ -263,11 +267,6 @@
dnl ====================================================================
dnl Output files to generate.
dnl ====================================================================
-
-dnl What an ugly hack to try to get something cleanner ... i hope ...
-AC_OUTPUT_COMMANDS(
- [cd include/nel && ln -sfv ../nelconfig.h .]
-)
AC_OUTPUT( Makefile \
include/Makefile \
Index: nel/include/nel/Makefile.am
===================================================================
RCS file: /home/cvsroot/code/nel/include/nel/Makefile.am,v
retrieving revision 1.2
diff -u -r1.2 Makefile.am
--- nel/include/nel/Makefile.am 7 Jan 2002 16:09:52 -0000 1.2
+++ nel/include/nel/Makefile.am 9 Mar 2002 11:05:37 -0000
@@ -4,7 +4,7 @@
MAINTAINERCLEANFILES = Makefile.in
-SUBDIRS = @NEL_SUBDIRS@
+SUBDIRS = 3d ai misc net pacs sound
includedir = ${prefix}/include/nel
Index: nel/src/Makefile.am
===================================================================
RCS file: /home/cvsroot/code/nel/src/Makefile.am,v
retrieving revision 1.6
diff -u -r1.6 Makefile.am
--- nel/src/Makefile.am 13 Jun 2001 18:05:00 -0000 1.6
+++ nel/src/Makefile.am 9 Mar 2002 11:05:41 -0000
@@ -4,6 +4,8 @@
MAINTAINERCLEANFILES = Makefile.in
+DIST_SUBDIRS = net 3d pacs sound ai misc
+
SUBDIRS = @NEL_SUBDIRS@
EXTRA_DIST = misc.dsp net.dsp 3d.dsp ai.dsp
Index: nel/src/3d/Makefile.am
===================================================================
RCS file: /home/cvsroot/code/nel/src/3d/Makefile.am,v
retrieving revision 1.70
diff -u -r1.70 Makefile.am
--- nel/src/3d/Makefile.am 4 Mar 2002 10:07:10 -0000 1.70
+++ nel/src/3d/Makefile.am 9 Mar 2002 11:05:41 -0000
@@ -74,7 +74,6 @@
event_mouse_listener.h \
fast_floor.cpp \
fast_floor.h \
- files.txt \
flare_model.cpp \
flare_model.h \
flare_shape.cpp \
@@ -483,6 +482,8 @@
zone_smoother.h \
zone_tgt_smoother.cpp \
zone_tgt_smoother.h
+
+noinst_HEADERS = std3d.h mesh_vertex_program.h meshvp_wind_tree.h
AM_CXXFLAGS = -I$(top_srcdir)/src @FREETYPE_CFLAGS@
Index: nel/src/3d/driver/opengl/Makefile.am
===================================================================
RCS file: /home/cvsroot/code/nel/src/3d/driver/opengl/Makefile.am,v
retrieving revision 1.10
diff -u -r1.10 Makefile.am
--- nel/src/3d/driver/opengl/Makefile.am 7 Jan 2002 16:09:52 -0000
1.10
+++ nel/src/3d/driver/opengl/Makefile.am 9 Mar 2002 11:05:41 -0000
@@ -22,10 +22,13 @@
unix_event_emitter.cpp \
unix_event_emitter.h
+noinst_HEADERS = stdopengl.h
+
AM_CXXFLAGS = -I$(top_srcdir)/src \
@OPENGL_CFLAGS@ @XF86VIDMODE_CFLAGS@
libnel_drv_opengl_la_LIBADD = @OPENGL_LIBS@ @XF86VIDMODE_LIBS@
+libnel_drv_opengl_la_LDFLAGS = -no-undefined
# End of Makefile.am
Index: nel/src/misc/Makefile.am
===================================================================
RCS file: /home/cvsroot/code/nel/src/misc/Makefile.am,v
retrieving revision 1.40
diff -u -r1.40 Makefile.am
--- nel/src/misc/Makefile.am 18 Feb 2002 12:57:05 -0000 1.40
+++ nel/src/misc/Makefile.am 9 Mar 2002 11:05:43 -0000
@@ -68,6 +68,7 @@
window_displayer.cpp \
debug_displayer.cpp
+noinst_HEADERS = stdmisc.h
AM_CXXFLAGS = @XML_CFLAGS@
Index: nel/src/net/Makefile.am
===================================================================
RCS file: /home/cvsroot/code/nel/src/net/Makefile.am,v
retrieving revision 1.15
diff -u -r1.15 Makefile.am
--- nel/src/net/Makefile.am 15 Feb 2002 14:40:21 -0000 1.15
+++ nel/src/net/Makefile.am 9 Mar 2002 11:05:43 -0000
@@ -36,6 +36,8 @@
service_5.cpp \
transport_class.cpp
+noinst_HEADERS = stdnet.h
+
AM_CXXFLAGS = -I$(top_srcdir)/src
libnelnet_la_LIBADD = -lc -lpthread
Index: nel/src/pacs/Makefile.am
===================================================================
RCS file: /home/cvsroot/code/nel/src/pacs/Makefile.am,v
retrieving revision 1.4
diff -u -r1.4 Makefile.am
--- nel/src/pacs/Makefile.am 9 Aug 2001 16:18:01 -0000 1.4
+++ nel/src/pacs/Makefile.am 9 Mar 2002 11:05:43 -0000
@@ -54,6 +54,8 @@
AM_CXXFLAGS = -I$(top_srcdir)/src
+noinst_HEADERS = stdpacs.h face_grid.h quad_grid.h
+
libnelpacs_la_LIBADD = -lc
libnelpacs_la_LDFLAGS = -version-info @LIBTOOL_VERSION@
--
Loic Dachary http://www.dachary.org/ address@hidden
12 bd Magenta http://www.senga.org/ address@hidden
75010 Paris T: 33 1 42 45 07 97 address@hidden
GPG Public Key: http://www.dachary.org/loic/gpg.txt
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Nel] NeL Debian GNU/Linux unstable package,
Loic Dachary <=