rpms/starlab/F-9 import.log, NONE, 1.1 starlab-4.4.3-autoconf263.patch, NONE, 1.1 starlab-4.4.3-buildcwd.patch, NONE, 1.1 starlab-4.4.3-error.patch, NONE, 1.1 starlab-4.4.3-libdeps.patch, NONE, 1.1 starlab-4.4.3-tstarplot.patch, NONE, 1.1 starlab.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Lubomir Rintel
lkundrak at fedoraproject.org
Mon Oct 13 09:06:44 UTC 2008
- Previous message: rpms/starlab/devel import.log, NONE, 1.1 starlab-4.4.3-autoconf263.patch, NONE, 1.1 starlab-4.4.3-buildcwd.patch, NONE, 1.1 starlab-4.4.3-error.patch, NONE, 1.1 starlab-4.4.3-libdeps.patch, NONE, 1.1 starlab-4.4.3-tstarplot.patch, NONE, 1.1 starlab.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message: rpms/python-cssutils/devel cssutils-0.9.5.1-nohashbang.patch, NONE, 1.1 python-cssutils.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: lkundrak
Update of /cvs/pkgs/rpms/starlab/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8803/F-9
Modified Files:
.cvsignore sources
Added Files:
import.log starlab-4.4.3-autoconf263.patch
starlab-4.4.3-buildcwd.patch starlab-4.4.3-error.patch
starlab-4.4.3-libdeps.patch starlab-4.4.3-tstarplot.patch
starlab.spec
Log Message:
Initial import
--- NEW FILE import.log ---
starlab-4_4_3-3_el5:F-9:starlab-4.4.3-3.el5.src.rpm:1223888742
starlab-4.4.3-autoconf263.patch:
--- NEW FILE starlab-4.4.3-autoconf263.patch ---
New autoconf doesn't know what's this, and we enable shared library builds
anyways.
Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk>
--- starlab-4.4.3/configure.ac.autoconf263 2008-10-05 18:27:33.000000000 +0200
+++ starlab-4.4.3/configure.ac 2008-10-05 18:27:56.000000000 +0200
@@ -63,8 +63,6 @@
AM_CONDITIONAL(HAVE_F77, [test -n "$F77"])
AC_PROG_CXX
-# disable shared libs for now -- work this out later
-AC_DISABLE_SHARED
AC_PROG_LIBTOOL
LIBTOOL="$LIBTOOL --preserve-dup-deps"
AC_SUBST(LIBTOOL)
starlab-4.4.3-buildcwd.patch:
--- NEW FILE starlab-4.4.3-buildcwd.patch ---
Build a directory before its subdirectoris. This is particularly useful when
installing, since libtool does some weirdnesses such as relinking (which is
far behind my scope of understanding of how the world works), and depends on
some libraries already installed in the destination before linking some other
ones. I'll buy a beer (or two! (or maybe three! (no lisp))) to anyone who
explains me how are the dependencies between libraries in multiple
subdirectories of a single project tree supposed to work.
To generate this I did:
$ find . -name Makefile.am -exec cp '{}' '{}.buildcwd' \; -exec sed 's/\(SUBDIRS.*=\)/\1 ./' -i '{}' \;
Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk>
--- starlab-4.4.3/src/hydro/Makefile.am.buildcwd 2008-10-04 21:45:31.000000000 +0200
+++ starlab-4.4.3/src/hydro/Makefile.am 2008-10-04 21:45:31.000000000 +0200
@@ -16,7 +16,7 @@
##..............................................................................
##
-SUBDIRS = util init evolve
+SUBDIRS = . util init evolve
pkglib_LTLIBRARIES = libhydro.la
--- starlab-4.4.3/src/node/dyn/hdyn/sdyn/Makefile.am.buildcwd 2008-10-04 21:45:31.000000000 +0200
+++ starlab-4.4.3/src/node/dyn/hdyn/sdyn/Makefile.am 2008-10-04 21:45:31.000000000 +0200
@@ -16,7 +16,7 @@
##..............................................................................
##
-SUBDIRS = util init evolve
+SUBDIRS = . util init evolve
pkglib_LTLIBRARIES = libsdyn.la
--- starlab-4.4.3/src/node/dyn/hdyn/Makefile.am.buildcwd 2008-10-04 21:45:31.000000000 +0200
+++ starlab-4.4.3/src/node/dyn/hdyn/Makefile.am 2008-10-04 21:45:31.000000000 +0200
@@ -16,17 +16,17 @@
##..............................................................................
##
-SUBDIRS = util evolve xutil
+SUBDIRS = . util evolve xutil
if USE_SDYN3
- SUBDIRS += sdyn3
+ SUBDIRS += . sdyn3
endif
if USE_SDYN
- SUBDIRS += sdyn
+ SUBDIRS += . sdyn
endif
-SUBDIRS += stubs $(SDYNS)
+SUBDIRS += . stubs $(SDYNS)
pkglib_LTLIBRARIES = libhdyn.la
--- starlab-4.4.3/src/node/dyn/hdyn/sdyn3/Makefile.am.buildcwd 2008-10-04 21:45:31.000000000 +0200
+++ starlab-4.4.3/src/node/dyn/hdyn/sdyn3/Makefile.am 2008-10-04 21:45:31.000000000 +0200
@@ -16,10 +16,10 @@
##..............................................................................
##
-SUBDIRS = util evolve
+SUBDIRS = . util evolve
if !NO_X
- SUBDIRS += xutil
+ SUBDIRS += . xutil
endif
pkglib_LTLIBRARIES = libsdyn3.la
--- starlab-4.4.3/src/node/dyn/Makefile.am.buildcwd 2008-10-04 21:45:31.000000000 +0200
+++ starlab-4.4.3/src/node/dyn/Makefile.am 2008-10-04 21:45:31.000000000 +0200
@@ -16,10 +16,10 @@
##..............................................................................
##
-SUBDIRS = util kepler init evolve _dyn_ hdyn tdyn
+SUBDIRS = . util kepler init evolve _dyn_ hdyn tdyn
if !NO_X
- SUBDIRS += xutil
+ SUBDIRS += . xutil
endif
pkglib_LTLIBRARIES = libdyn.la
--- starlab-4.4.3/src/node/Makefile.am.buildcwd 2008-10-04 21:45:31.000000000 +0200
+++ starlab-4.4.3/src/node/Makefile.am 2008-10-04 21:45:31.000000000 +0200
@@ -16,7 +16,7 @@
##..............................................................................
##
-SUBDIRS = util dyn
+SUBDIRS = . util dyn
pkglib_LTLIBRARIES = libnode.la
--- starlab-4.4.3/src/gfx/Makefile.am.buildcwd 2008-10-04 21:45:31.000000000 +0200
+++ starlab-4.4.3/src/gfx/Makefile.am 2008-10-04 21:45:31.000000000 +0200
@@ -16,9 +16,9 @@
##..............................................................................
##
-SUBDIRS = util
+SUBDIRS = . util
if !NO_X
- SUBDIRS += lux lux++ #libs draw
+ SUBDIRS += . lux lux++ #libs draw
endif
pkglib_LTLIBRARIES = libgfx.la
--- starlab-4.4.3/src/Makefile.am.buildcwd 2008-10-04 21:45:31.000000000 +0200
+++ starlab-4.4.3/src/Makefile.am 2008-10-04 21:45:31.000000000 +0200
@@ -16,10 +16,10 @@
##..............................................................................
##
-SUBDIRS = std node star hydro harpsims
+SUBDIRS = . std node star hydro harpsims
if !NO_X
- SUBDIRS += gfx
+ SUBDIRS += . gfx
endif
# Comment out these lines to avoid exporting the autools packages.
--- starlab-4.4.3/src/star/sstar/Makefile.am.buildcwd 2008-10-04 21:45:31.000000000 +0200
+++ starlab-4.4.3/src/star/sstar/Makefile.am 2008-10-04 21:45:31.000000000 +0200
@@ -16,7 +16,7 @@
##..............................................................................
##
-SUBDIRS = starclass init io stardyn evolve
+SUBDIRS = . starclass init io stardyn evolve
pkglib_LTLIBRARIES = libsstar.la
--- starlab-4.4.3/src/star/dstar/Makefile.am.buildcwd 2008-10-04 21:45:31.000000000 +0200
+++ starlab-4.4.3/src/star/dstar/Makefile.am 2008-10-04 21:45:31.000000000 +0200
@@ -17,10 +17,10 @@
##..............................................................................
##
-SUBDIRS = starclass init io stardyn util evolve
+SUBDIRS = . starclass init io stardyn util evolve
if USE_SDYN3
- SUBDIRS += sdyn3
+ SUBDIRS += . sdyn3
endif
# Library to build and install:
--- starlab-4.4.3/src/star/Makefile.am.buildcwd 2008-10-04 21:45:32.000000000 +0200
+++ starlab-4.4.3/src/star/Makefile.am 2008-10-04 21:45:32.000000000 +0200
@@ -16,12 +16,12 @@
##..............................................................................
##
-SUBDIRS = sstar dstar util
+SUBDIRS = . sstar dstar util
# rdc # don't put # on the previous line, as it will suppress xutil too!
if !NO_X
- SUBDIRS += xutil
+ SUBDIRS += . xutil
endif
-SUBDIRS += rdc
+SUBDIRS += . rdc
--- starlab-4.4.3/Makefile.am.buildcwd 2008-10-04 21:45:32.000000000 +0200
+++ starlab-4.4.3/Makefile.am 2008-10-04 21:45:32.000000000 +0200
@@ -336,7 +336,7 @@
# Add sbin to SUBDIRS to ensure that utilities are built first.
# Add include to SUBDIRS to ensure that make install goes there.
-SUBDIRS = sbin src include
+SUBDIRS = . sbin src include
all-recursive: libs
starlab-4.4.3-error.patch:
--- NEW FILE starlab-4.4.3-error.patch ---
Do not proceed building if something fails.
Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk>
--- starlab-4.4.3/Makefile.am.error 2008-07-27 17:31:09.000000000 +0200
+++ starlab-4.4.3/Makefile.am 2005-10-25 17:39:56.000000000 +0200
@@ -376,7 +376,7 @@
libs:
for dir in $(LIBDIRS); do \
echo Making libs in $$dir; \
- $(MAKE) $(AM_MAKEFLAGS) -C $$dir libs; \
+ $(MAKE) $(AM_MAKEFLAGS) -C $$dir libs || exit 1; \
done
man:
starlab-4.4.3-libdeps.patch:
--- NEW FILE starlab-4.4.3-libdeps.patch ---
Exchange the cold days for the sun,
good times and fun...
...and lay dynamic library interdependencies on tools' back.
Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk>
--- starlab-4.4.3/src/gfx/lux/Makefile.am 2004-09-24 22:24:55.000000000 +0200
+++ starlab-4.4.3.shared/src/gfx/lux/Makefile.am 2008-09-06 07:58:11.000000000 +0200
@@ -21,9 +21,14 @@ bin_PROGRAMS = plot_data simple ximage
libgfx_2_la_SOURCES = win.c draw.c draw1.c color.c dialog.c mcd.c interface.c \
termio.c utility.c simple.c
+libgfx_2_la_LDFLAGS = -lstdc++
simple_CPPFLAGS = -DTEST
plot_data_LDADD = ../libgfx.la
simple_LDADD = ../libgfx.la
ximage_LDADD = ../libgfx.la
+
+plot_data_LDFLAGS = -lstdc++
+simple_LDFLAGS = -lstdc++
+ximage_LDFLAGS = -lstdc++
--- starlab-4.4.3/src/hydro/evolve/Makefile.am 2004-07-15 23:43:04.000000000 +0200
+++ starlab-4.4.3.shared/src/hydro/evolve/Makefile.am 2008-09-06 07:48:10.000000000 +0200
@@ -21,8 +21,8 @@ bin_PROGRAMS = chydro_leapfrog hydro_lea
chydro_leapfrog_CPPFLAGS = -DTOOLBOX
hydro_leapfrog_CPPFLAGS = -DTOOLBOX
-chydro_leapfrog_LDADD = ../libhydro.la ../../node/dyn/libdyn.la
-hydro_leapfrog_LDADD = ../libhydro.la ../../node/dyn/libdyn.la
+chydro_leapfrog_LDADD = ../libhydro.la ../../node/dyn/libdyn.la ../../star/sstar/libsstar.la
+hydro_leapfrog_LDADD = ../libhydro.la ../../node/dyn/libdyn.la ../../star/sstar/libsstar.la
chydro_leapfrog_SOURCES = chydro_leapfrog.C
hydro_leapfrog_SOURCES = hydro_leapfrog.C
--- starlab-4.4.3/src/node/dyn/_dyn_/Makefile.am 2004-07-15 23:43:03.000000000 +0200
+++ starlab-4.4.3.shared/src/node/dyn/_dyn_/Makefile.am 2008-09-06 09:43:51.000000000 +0200
@@ -27,10 +27,10 @@ _dyn_io_CPPFLAGS = -DTOOLBOX
no_xreal_CPPFLAGS = -DTOOLBOX
set_radius_CPPFLAGS = -DTOOLBOX
-flat_hermite_LDADD = lib_dyn_.la
-_dyn_io_LDADD = lib_dyn_.la
-no_xreal_LDADD = lib_dyn_.la
-set_radius_LDADD = lib_dyn_.la
+flat_hermite_LDADD = lib_dyn_.la ../../../star/sstar/libsstar.la
+_dyn_io_LDADD = lib_dyn_.la ../../../star/sstar/libsstar.la
+no_xreal_LDADD = lib_dyn_.la ../../../star/sstar/libsstar.la
+set_radius_LDADD = lib_dyn_.la ../../../star/sstar/libsstar.la
flat_hermite_SOURCES = flat_hermite.C
_dyn_io_SOURCES = _dyn_io.C
--- starlab-4.4.3/src/node/dyn/evolve/Makefile.am 2004-07-15 23:43:03.000000000 +0200
+++ starlab-4.4.3.shared/src/node/dyn/evolve/Makefile.am 2008-09-05 16:45:06.000000000 +0200
@@ -23,6 +23,6 @@ libdyn_4_la_SOURCES = dyn_ev.C
leapfrog_CPPFLAGS = -DTOOLBOX
-leapfrog_LDADD = ../libdyn.la
+leapfrog_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
leapfrog_SOURCES = leapfrog.C
--- starlab-4.4.3/src/node/dyn/hdyn/util/Makefile.am 2008-07-04 00:11:58.000000000 +0200
+++ starlab-4.4.3.shared/src/node/dyn/hdyn/util/Makefile.am 2008-09-05 17:03:03.000000000 +0200
@@ -31,13 +31,13 @@ get_densities_CPPFLAGS = -DTOOLBOX
hdyn_io_CPPFLAGS = -DTOOLBOX
sync_times_CPPFLAGS = -DTOOLBOX
-hdyn_pp3_LDADD = ../libhdyn.la
-reset_counters_LDADD = ../libhdyn.la
-hsys_stats_LDADD = ../libhdyn.la ../../../../star/dstar/libdstar.la
-hscale_LDADD = ../libhdyn.la ../../../../star/dstar/libdstar.la
-get_densities_LDADD = ../libhdyn.la ../../../../star/dstar/libdstar.la
-hdyn_io_LDADD = ../libhdyn.la ../../../../star/dstar/libdstar.la
-sync_times_LDADD = ../libhdyn.la
+hdyn_pp3_LDADD = ../libhdyn.la ../xutil/libxhdyn.la ../../../../star/dstar/libdstar.la ../stubs/libstubs.la
+reset_counters_LDADD = ../libhdyn.la ../xutil/libxhdyn.la ../../../../star/dstar/libdstar.la ../stubs/libstubs.la
+hsys_stats_LDADD = ../libhdyn.la ../xutil/libxhdyn.la ../../../../star/dstar/libdstar.la ../stubs/libstubs.la
+hscale_LDADD = ../libhdyn.la ../xutil/libxhdyn.la ../../../../star/dstar/libdstar.la ../stubs/libstubs.la
+get_densities_LDADD = ../libhdyn.la ../xutil/libxhdyn.la ../../../../star/dstar/libdstar.la ../stubs/libstubs.la
+hdyn_io_LDADD = ../libhdyn.la ../xutil/libxhdyn.la ../../../../star/dstar/libdstar.la ../stubs/libstubs.la
+sync_times_LDADD = ../libhdyn.la ../xutil/libxhdyn.la ../../../../star/dstar/libdstar.la ../stubs/libstubs.la
hdyn_pp3_SOURCES = hdyn_pp3.C
reset_counters_SOURCES = reset_counters.C
--- starlab-4.4.3/src/node/dyn/hdyn/xutil/Makefile.am 2008-07-04 17:47:13.000000000 +0200
+++ starlab-4.4.3.shared/src/node/dyn/hdyn/xutil/Makefile.am 2008-09-06 09:27:47.000000000 +0200
@@ -34,15 +34,15 @@ if HAVE_LIBQT
libxhdyn_la_LDFLAGS += @QT_LIBS@ $(X_PRE_LIBS) -lX11 $(X_EXTRA_LIBS)
libxhdyn_la_SOURCES += pp3_widget.C moc_pp3_widget.C
Qt_pp3_CPPFLAGS = -DTOOLBOX
- Qt_pp3_LDADD = libxhdyn.la
+ Qt_pp3_LDADD = libxhdyn.la ../libhdyn.la ../../../../star/dstar/libdstar.la ../stubs/libstubs.la
Qt_pp3_SOURCES = Qt_pp3.C
AM_LDFLAGS = $(X_LIBS)
BUILT_SOURCES = moc_pp3_widget.C
CLEANFILES = moc_pp3_widget.C
endif
-snap_to_image_LDADD = ../libhdyn.la ../../../../gfx/libgfx.la
-hxstarplot_LDADD = ../libhdyn.la ../../../../gfx/libgfx.la
+snap_to_image_LDADD = ../libhdyn.la ../xutil/libxhdyn.la ../../../../star/dstar/libdstar.la ../stubs/libstubs.la ../../../../gfx/libgfx.la
+hxstarplot_LDADD = ../libhdyn.la ../xutil/libxhdyn.la ../../../../star/dstar/libdstar.la ../stubs/libstubs.la ../../../../gfx/libgfx.la
snap_to_image_SOURCES = snap_to_image.C
hxstarplot_SOURCES = hxstarplot.C gfx_util.C dyn_util.C
--- starlab-4.4.3/src/node/dyn/init/Makefile.am 2008-06-17 23:21:42.000000000 +0200
+++ starlab-4.4.3.shared/src/node/dyn/init/Makefile.am 2008-09-05 16:44:28.000000000 +0200
@@ -26,7 +26,7 @@ bin_PROGRAMS = makecube makedisk makeplu
if HAVE_F77
bin_PROGRAMS += make_aniso_king
make_aniso_king_CPPFLAGS = -DTOOLBOX
- make_aniso_king_LDADD = ../libdyn.la $(FLIBS)
+ make_aniso_king_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la $(FLIBS)
make_aniso_king_SOURCES = make_aniso_king.C aking.f
endif
@@ -52,25 +52,25 @@ grow_black_hole_CPPFLAGS = -DTOOLBOX
makepowerlaw_CPPFLAGS = -DTOOLBOX
cutrandomsample_CPPFLAGS = -DTOOLBOX
-makecube_LDADD = ../libdyn.la
-makedisk_LDADD = ../libdyn.la
-makeplummer_LDADD = ../libdyn.la
-makepyth_LDADD = ../libdyn.la
-makesphere_LDADD = ../libdyn.la
-makewrite_LDADD = ../libdyn.la
-apply_plummer_LDADD = ../libdyn.la
-makebinary_LDADD = ../libdyn.la
-split_particles_LDADD = ../libdyn.la
-makeking_LDADD = ../libdyn.la
-makeheavystar_LDADD = ../libdyn.la
-readp_LDADD = ../libdyn.la
-readp2_LDADD = ../libdyn.la
-readstoa_LDADD = ../libdyn.la
-makeplanetary_LDADD = ../libdyn.la
-makeblack_hole_LDADD = ../libdyn.la
-grow_black_hole_LDADD = ../libdyn.la
-makepowerlaw_LDADD = ../libdyn.la
-cutrandomsample_LDADD = ../libdyn.la
+makecube_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+makedisk_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+makeplummer_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+makepyth_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+makesphere_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+makewrite_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+apply_plummer_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+makebinary_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+split_particles_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+makeking_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+makeheavystar_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+readp_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+readp2_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+readstoa_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+makeplanetary_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+makeblack_hole_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+grow_black_hole_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+makepowerlaw_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+cutrandomsample_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
makecube_SOURCES = makecube.C
makedisk_SOURCES = makedisk.C
--- starlab-4.4.3/src/node/dyn/kepler/Makefile.am 2004-07-15 23:43:03.000000000 +0200
+++ starlab-4.4.3.shared/src/node/dyn/kepler/Makefile.am 2008-09-05 16:41:12.000000000 +0200
@@ -23,6 +23,6 @@ libdyn_2_la_SOURCES = kepler.C
kepler_CPPFLAGS = -DTOOLBOX
-kepler_LDADD = ../libdyn.la
+kepler_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
kepler_SOURCES = kepler.C
--- starlab-4.4.3/src/node/dyn/tdyn/Makefile.am 2004-09-24 22:24:55.000000000 +0200
+++ starlab-4.4.3.shared/src/node/dyn/tdyn/Makefile.am 2008-09-06 09:53:50.000000000 +0200
@@ -33,12 +33,12 @@ tdyn_io_CPPFLAGS = -DTOOLBOX
worldlines_CPPFLAGS = -DTOOLBOX
xstarplot22_CPPFLAGS = -DTOOLBOX
-print_id_LDADD = libtdyn.la
-scanbinary_LDADD = libtdyn.la
-scanbundle_LDADD = libtdyn.la
-tdyn_io_LDADD = libtdyn.la
-worldlines_LDADD = libtdyn.la
-xstarplot22_LDADD = libtdyn.la ../../../gfx/libgfx.la
+print_id_LDADD = libtdyn.la ../../../star/sstar/libsstar.la
+scanbinary_LDADD = libtdyn.la ../../../star/sstar/libsstar.la
+scanbundle_LDADD = libtdyn.la ../../../star/sstar/libsstar.la
+tdyn_io_LDADD = libtdyn.la ../../../star/sstar/libsstar.la
+worldlines_LDADD = libtdyn.la ../../../star/sstar/libsstar.la
+xstarplot22_LDADD = libtdyn.la ../../../gfx/libgfx.la ../../../star/sstar/libsstar.la
print_id_SOURCES = print_id.C
scanbinary_SOURCES = scanbinary.C
--- starlab-4.4.3/src/node/dyn/util/Makefile.am 2007-08-07 21:03:58.000000000 +0200
+++ starlab-4.4.3.shared/src/node/dyn/util/Makefile.am 2008-09-05 16:37:13.000000000 +0200
@@ -84,53 +84,53 @@ print_radii_CPPFLAGS = -DTOOLBOX
hop_CPPFLAGS = -DTOOLBOX
test_util_CPPFLAGS = -DTOOLBOX
-compute_com_LDADD = ../libdyn.la
-compute_mcom_LDADD = ../libdyn.la
-compute_density_LDADD = ../libdyn.la
-compute_max_cod_LDADD = ../libdyn.la
-compute_mean_cod_LDADD = ../libdyn.la
-dumbp_LDADD = ../libdyn.la
-dyn_io_LDADD = ../libdyn.la
-dyndiff_LDADD = ../libdyn.la
-dyndist_LDADD = ../libdyn.la
-energy_LDADD = ../libdyn.la
-extract_snap_LDADD = ../libdyn.la
-flatten_LDADD = ../libdyn.la
-freeze_LDADD = ../libdyn.la
-freezebin_LDADD = ../libdyn.la
-lagrad_LDADD = ../libdyn.la
-lagradplot_LDADD = ../libdyn.la
-list_snap_LDADD = ../libdyn.la
-merge_low_LDADD = ../libdyn.la
-molecules_LDADD = ../libdyn.la
-reflect_velocities_LDADD = ../libdyn.la
-scale_LDADD = ../libdyn.la
-plot_stars_LDADD = ../libdyn.la
-starplot_LDADD = ../libdyn.la
-snap2speck_LDADD = ../libdyn.la
+compute_com_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+compute_mcom_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+compute_density_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+compute_max_cod_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+compute_mean_cod_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+dumbp_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+dyn_io_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+dyndiff_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+dyndist_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+energy_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+extract_snap_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+flatten_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+freeze_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+freezebin_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+lagrad_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+lagradplot_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+list_snap_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+merge_low_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+molecules_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+reflect_velocities_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+scale_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+plot_stars_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+starplot_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+snap2speck_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
sys_stats_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
-set_com_LDADD = ../libdyn.la
-to_com_LDADD = ../libdyn.la
-jiggle_LDADD = ../libdyn.la
-lagradplotsmooth_LDADD = ../libdyn.la
-get_std_center_LDADD = ../libdyn.la
-add_plummer_LDADD = ../libdyn.la
-add_power_law_LDADD = ../libdyn.la
-add_tidal_LDADD = ../libdyn.la
-set_ignore_internal_LDADD = ../libdyn.la
-add_daughter_node_LDADD = ../libdyn.la
-getsnap_LDADD = ../libdyn.la
-print_time_LDADD = ../libdyn.la
-radial_density_LDADD = ../libdyn.la
-radial_numdensity_LDADD = ../libdyn.la
-radial_vdisp_LDADD = ../libdyn.la
-radial_profile_LDADD = ../libdyn.la
-makemass_LDADD = ../libdyn.la
-makesecondary_LDADD = ../libdyn.la
-merge_snaps_LDADD = ../libdyn.la
-print_radii_LDADD = ../libdyn.la
-hop_LDADD = ../libdyn.la
-test_util_LDADD = ../libdyn.la
+set_com_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+to_com_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+jiggle_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+lagradplotsmooth_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+get_std_center_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+add_plummer_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+add_power_law_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+add_tidal_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+set_ignore_internal_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+add_daughter_node_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+getsnap_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+print_time_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+radial_density_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+radial_numdensity_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+radial_vdisp_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+radial_profile_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+makemass_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+makesecondary_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+merge_snaps_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+print_radii_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+hop_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
+test_util_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la
compute_com_SOURCES = compute_com.C
compute_mcom_SOURCES = compute_mcom.C
--- starlab-4.4.3/src/node/dyn/xutil/Makefile.am 2004-09-28 19:46:33.000000000 +0200
+++ starlab-4.4.3.shared/src/node/dyn/xutil/Makefile.am 2008-09-05 17:25:57.000000000 +0200
@@ -18,5 +18,5 @@
bin_PROGRAMS = xstarplot
-xstarplot_LDADD = ../libdyn.la ../../../gfx/libgfx.la
+xstarplot_LDADD = ../libdyn.la ../../../star/sstar/libsstar.la ../../../gfx/libgfx.la
xstarplot_SOURCES = xstarplot.C
--- starlab-4.4.3/src/star/dstar/evolve/Makefile.am 2004-09-06 20:17:39.000000000 +0200
+++ starlab-4.4.3.shared/src/star/dstar/evolve/Makefile.am 2008-09-06 09:58:05.000000000 +0200
@@ -25,4 +25,4 @@ bin_PROGRAMS = SeBa
SeBa_SOURCES = SeBa.C
SeBa_CPPFLAGS = -DTOOLBOX
-SeBa_LDADD = ../libdstar.la ../../../node/dyn/libdyn.la
+SeBa_LDADD = ../libdstar.la ../../../node/dyn/libdyn.la ../../../node/dyn/hdyn/libhdyn.la ../../../node/dyn/hdyn/xutil/libxhdyn.la ../../../star/dstar/libdstar.la ../../../node/dyn/hdyn/stubs/libstubs.la
--- starlab-4.4.3/src/star/dstar/stardyn/Makefile.am 2004-09-06 20:17:39.000000000 +0200
+++ starlab-4.4.3.shared/src/star/dstar/stardyn/Makefile.am 2008-09-05 17:34:12.000000000 +0200
@@ -31,9 +31,9 @@ adddouble_CPPFLAGS = -DTOOLBOX
dstar_state_CPPFLAGS = -DTOOLBOX
dstar_stats_CPPFLAGS = -DTOOLBOX
-adddouble_LDADD = ../libdstar.la ../../../node/dyn/hdyn/libhdyn.la
-dstar_state_LDADD = ../libdstar.la ../../../node/dyn/hdyn/libhdyn.la
-dstar_stats_LDADD = ../libdstar.la ../../../node/dyn/hdyn/libhdyn.la
+adddouble_LDADD = ../libdstar.la ../../../node/dyn/hdyn/libhdyn.la ../../../node/dyn/hdyn/xutil/libxhdyn.la ../../../star/dstar/libdstar.la ../../../node/dyn/hdyn/stubs/libstubs.la
+dstar_state_LDADD = ../libdstar.la ../../../node/dyn/hdyn/libhdyn.la ../../../node/dyn/hdyn/xutil/libxhdyn.la ../../../star/dstar/libdstar.la ../../../node/dyn/hdyn/stubs/libstubs.la
+dstar_stats_LDADD = ../libdstar.la ../../../node/dyn/hdyn/libhdyn.la ../../../node/dyn/hdyn/xutil/libxhdyn.la ../../../star/dstar/libdstar.la ../../../node/dyn/hdyn/stubs/libstubs.la
# Local library and sources (sub-libraries will be combined later):
--- starlab-4.4.3/src/star/dstar/util/Makefile.am 2004-09-06 20:17:39.000000000 +0200
+++ starlab-4.4.3.shared/src/star/dstar/util/Makefile.am 2008-09-05 17:34:32.000000000 +0200
@@ -26,7 +26,7 @@ bin_PROGRAMS = semi_to_period
semi_to_period_SOURCES = semi_to_period.C
semi_to_period_CPPFLAGS = -DTOOLBOX
semi_to_period_LDADD = ../libdstar.la \
- ../../../node/dyn/hdyn/libhdyn.la
+ ../../../node/dyn/hdyn/libhdyn.la ../../../node/dyn/hdyn/xutil/libxhdyn.la ../../../star/dstar/libdstar.la ../../../node/dyn/hdyn/stubs/libstubs.la
# Local library and sources (sub-libraries will be combined later):
--- starlab-4.4.3/src/star/rdc/Makefile.am 2008-07-04 16:10:35.000000000 +0200
+++ starlab-4.4.3.shared/src/star/rdc/Makefile.am 2008-09-06 10:09:34.000000000 +0200
@@ -20,7 +20,8 @@ bin_PROGRAMS = list_sdumb makepovfile rd
rs_findtype rs_population rs_reorder rs_scenarios rs_snapshot
#make_ccd
-librdc_la_SOURCES = SeBa_hist.C makepovfile.C rdc_SeBa.C
+librdc_la_SOURCES = SeBa_hist.C makepovfile.C
+#librdc_la_SOURCES = SeBa_hist.C makepovfile.C rdc_SeBa.C
list_sdumb_CPPFLAGS = -DTOOLBOX
#make_ccd_CPPFLAGS = -DTOOLBOX
@@ -35,17 +36,17 @@ rs_scenarios_CPPFLAGS = -DTOOLBOX
rs_snapshot_CPPFLAGS = -DTOOLBOX
-list_sdumb_LDADD = ../sstar/libsstar.la ../../node/dyn/hdyn/libhdyn.la
+list_sdumb_LDADD = ../sstar/libsstar.la ../../node/dyn/hdyn/libhdyn.la ../../node/dyn/hdyn/xutil/libxhdyn.la ../../star/dstar/libdstar.la ../../node/dyn/hdyn/stubs/libstubs.la
#make_ccd_LDADD = ../sstar/libsstar.la ../../node/dyn/libdyn.la
-makepovfile_LDADD = librdc.la ../sstar/libsstar.la ../../node/dyn/libdyn.la
-rdc_SeBa_LDADD = librdc.la ../dstar/libdstar.la ../../node/dyn/libdyn.la
-rs_birthrate_LDADD = librdc.la ../dstar/libdstar.la ../../node/libnode.la
-rs_countsn_LDADD = librdc.la ../dstar/libdstar.la ../../node/libnode.la
-rs_findtype_LDADD = librdc.la ../dstar/libdstar.la ../../node/libnode.la
-rs_population_LDADD = librdc.la ../dstar/libdstar.la ../../node/libnode.la
-rs_reorder_LDADD = librdc.la ../dstar/libdstar.la ../../node/libnode.la
-rs_scenarios_LDADD = librdc.la ../dstar/libdstar.la ../../node/libnode.la
-rs_snapshot_LDADD = librdc.la ../dstar/libdstar.la ../../node/libnode.la
+makepovfile_LDADD = librdc.la ../sstar/libsstar.la ../../node/dyn/libdyn.la ../dstar/libdstar.la ../../node/dyn/hdyn/libhdyn.la ../../node/dyn/hdyn/xutil/libxhdyn.la ../../star/dstar/libdstar.la ../../node/dyn/hdyn/stubs/libstubs.la
+rdc_SeBa_LDADD = librdc.la ../dstar/libdstar.la ../../node/dyn/libdyn.la ../../node/dyn/hdyn/libhdyn.la ../../node/dyn/hdyn/xutil/libxhdyn.la ../../star/dstar/libdstar.la ../../node/dyn/hdyn/stubs/libstubs.la
+rs_birthrate_LDADD = librdc.la ../dstar/libdstar.la ../../node/libnode.la ../../node/dyn/hdyn/libhdyn.la ../../node/dyn/hdyn/xutil/libxhdyn.la ../../star/dstar/libdstar.la ../../node/dyn/hdyn/stubs/libstubs.la
+rs_countsn_LDADD = librdc.la ../dstar/libdstar.la ../../node/libnode.la ../../node/dyn/hdyn/libhdyn.la ../../node/dyn/hdyn/xutil/libxhdyn.la ../../star/dstar/libdstar.la ../../node/dyn/hdyn/stubs/libstubs.la
+rs_findtype_LDADD = librdc.la ../dstar/libdstar.la ../../node/libnode.la ../../node/dyn/hdyn/libhdyn.la ../../node/dyn/hdyn/xutil/libxhdyn.la ../../star/dstar/libdstar.la ../../node/dyn/hdyn/stubs/libstubs.la
+rs_population_LDADD = librdc.la ../dstar/libdstar.la ../../node/libnode.la ../../node/dyn/hdyn/libhdyn.la ../../node/dyn/hdyn/xutil/libxhdyn.la ../../star/dstar/libdstar.la ../../node/dyn/hdyn/stubs/libstubs.la
+rs_reorder_LDADD = librdc.la ../dstar/libdstar.la ../../node/libnode.la ../../node/dyn/hdyn/libhdyn.la ../../node/dyn/hdyn/xutil/libxhdyn.la ../../star/dstar/libdstar.la ../../node/dyn/hdyn/stubs/libstubs.la
+rs_scenarios_LDADD = librdc.la ../dstar/libdstar.la ../../node/libnode.la ../../node/dyn/hdyn/libhdyn.la ../../node/dyn/hdyn/xutil/libxhdyn.la ../../star/dstar/libdstar.la ../../node/dyn/hdyn/stubs/libstubs.la
+rs_snapshot_LDADD = librdc.la ../dstar/libdstar.la ../../node/libnode.la ../../node/dyn/hdyn/libhdyn.la ../../node/dyn/hdyn/xutil/libxhdyn.la ../../star/dstar/libdstar.la ../../node/dyn/hdyn/stubs/libstubs.la
list_sdumb_SOURCES = list_sdumb.C
#make_ccd_SOURCES = make_ccd.C
--- starlab-4.4.3/src/star/sstar/init/Makefile.am 2004-07-15 23:43:03.000000000 +0200
+++ starlab-4.4.3.shared/src/star/sstar/init/Makefile.am 2008-09-05 17:31:30.000000000 +0200
@@ -23,6 +23,6 @@ libsstar_2_la_SOURCES = add_star.C
add_star_CPPFLAGS = -DTOOLBOX
-add_star_LDADD = ../libsstar.la ../../../node/dyn/hdyn/libhdyn.la
+add_star_LDADD = ../libsstar.la ../../../node/dyn/hdyn/libhdyn.la ../../../node/dyn/hdyn/xutil/libxhdyn.la ../../../star/dstar/libdstar.la ../../../node/dyn/hdyn/stubs/libstubs.la
add_star_SOURCES = add_star.C
--- starlab-4.4.3/src/star/sstar/stardyn/Makefile.am 2004-07-15 23:43:04.000000000 +0200
+++ starlab-4.4.3.shared/src/star/sstar/stardyn/Makefile.am 2008-09-05 17:32:07.000000000 +0200
@@ -24,6 +24,6 @@ libsstar_4_la_SOURCES = sstar_to_dyn.C s
sstar_stats_CPPFLAGS = -DTOOLBOX
-sstar_stats_LDADD = ../libsstar.la ../../../node/dyn/hdyn/libhdyn.la
+sstar_stats_LDADD = ../libsstar.la ../../../node/dyn/hdyn/libhdyn.la ../../../node/dyn/hdyn/xutil/libxhdyn.la ../../../star/dstar/libdstar.la ../../../node/dyn/hdyn/stubs/libstubs.la
sstar_stats_SOURCES = sstar_stats.C
--- starlab-4.4.3/src/star/util/Makefile.am 2007-11-14 21:30:24.000000000 +0100
+++ starlab-4.4.3.shared/src/star/util/Makefile.am 2008-09-05 17:40:57.000000000 +0200
@@ -37,20 +37,19 @@ makedyn_from_input_CPPFLAGS = -DTOOLBOX
nn_distribution_CPPFLAGS = -DTOOLBOX
calculate_individual_energies = -DTOOLBOX
-kingfit_LDADD = ../dstar/libdstar.la ../../node/dyn/libdyn.la
-red_stellar_system_LDADD = ../dstar/libdstar.la ../../node/dyn/libdyn.la
-rcore2_LDADD = ../dstar/libdstar.la ../../node/dyn/libdyn.la
-coagulation_LDADD = ../dstar/libdstar.la ../../node/dyn/libdyn.la
-rearrange_mf_LDADD = ../dstar/libdstar.la ../../node/dyn/libdyn.la
-red_star_cluster_LDADD = ../dstar/libdstar.la ../../node/dyn/libdyn.la
-encountervelocity_LDADD = ../dstar/libdstar.la ../../node/dyn/libdyn.la
-imf_evolve_LDADD = ../dstar/libdstar.la ../../node/dyn/libdyn.la
-proj_lagr_LDADD = ../dstar/libdstar.la ../../node/dyn/libdyn.la
-lmt_to_ubvri_LDADD = ../dstar/libdstar.la ../../node/dyn/libdyn.la
-makedyn_from_input_LDADD = ../dstar/libdstar.la ../../node/dyn/libdyn.la
-nn_distribution_LDADD = ../dstar/libdstar.la ../../node/dyn/libdyn.la
-calculate_individual_energies_LDADD = ../dstar/libdstar.la ../../node/dyn/libdyn.la
-
+kingfit_LDADD = ../dstar/libdstar.la ../../node/dyn/libdyn.la ../../node/dyn/hdyn/libhdyn.la ../../node/dyn/hdyn/xutil/libxhdyn.la ../../star/dstar/libdstar.la ../../node/dyn/hdyn/stubs/libstubs.la
+red_stellar_system_LDADD = ../dstar/libdstar.la ../../node/dyn/libdyn.la ../../node/dyn/libdyn.la ../../node/dyn/hdyn/libhdyn.la ../../node/dyn/hdyn/xutil/libxhdyn.la ../../star/dstar/libdstar.la ../../node/dyn/hdyn/stubs/libstubs.la
+rcore2_LDADD = ../dstar/libdstar.la ../../node/dyn/libdyn.la ../../node/dyn/libdyn.la ../../node/dyn/hdyn/libhdyn.la ../../node/dyn/hdyn/xutil/libxhdyn.la ../../star/dstar/libdstar.la ../../node/dyn/hdyn/stubs/libstubs.la
+coagulation_LDADD = ../dstar/libdstar.la ../../node/dyn/libdyn.la ../../node/dyn/libdyn.la ../../node/dyn/hdyn/libhdyn.la ../../node/dyn/hdyn/xutil/libxhdyn.la ../../star/dstar/libdstar.la ../../node/dyn/hdyn/stubs/libstubs.la
+rearrange_mf_LDADD = ../dstar/libdstar.la ../../node/dyn/libdyn.la ../../node/dyn/libdyn.la ../../node/dyn/hdyn/libhdyn.la ../../node/dyn/hdyn/xutil/libxhdyn.la ../../star/dstar/libdstar.la ../../node/dyn/hdyn/stubs/libstubs.la
+red_star_cluster_LDADD = ../dstar/libdstar.la ../../node/dyn/libdyn.la ../../node/dyn/libdyn.la ../../node/dyn/hdyn/libhdyn.la ../../node/dyn/hdyn/xutil/libxhdyn.la ../../star/dstar/libdstar.la ../../node/dyn/hdyn/stubs/libstubs.la
+encountervelocity_LDADD = ../dstar/libdstar.la ../../node/dyn/libdyn.la ../../node/dyn/libdyn.la ../../node/dyn/hdyn/libhdyn.la ../../node/dyn/hdyn/xutil/libxhdyn.la ../../star/dstar/libdstar.la ../../node/dyn/hdyn/stubs/libstubs.la
+imf_evolve_LDADD = ../dstar/libdstar.la ../../node/dyn/libdyn.la ../../node/dyn/libdyn.la ../../node/dyn/hdyn/libhdyn.la ../../node/dyn/hdyn/xutil/libxhdyn.la ../../star/dstar/libdstar.la ../../node/dyn/hdyn/stubs/libstubs.la
+proj_lagr_LDADD = ../dstar/libdstar.la ../../node/dyn/libdyn.la ../../node/dyn/libdyn.la ../../node/dyn/hdyn/libhdyn.la ../../node/dyn/hdyn/xutil/libxhdyn.la ../../star/dstar/libdstar.la ../../node/dyn/hdyn/stubs/libstubs.la
+lmt_to_ubvri_LDADD = ../dstar/libdstar.la ../../node/dyn/libdyn.la ../../node/dyn/libdyn.la ../../node/dyn/hdyn/libhdyn.la ../../node/dyn/hdyn/xutil/libxhdyn.la ../../star/dstar/libdstar.la ../../node/dyn/hdyn/stubs/libstubs.la
+makedyn_from_input_LDADD = ../dstar/libdstar.la ../../node/dyn/libdyn.la ../../node/dyn/libdyn.la ../../node/dyn/hdyn/libhdyn.la ../../node/dyn/hdyn/xutil/libxhdyn.la ../../star/dstar/libdstar.la ../../node/dyn/hdyn/stubs/libstubs.la
+nn_distribution_LDADD = ../dstar/libdstar.la ../../node/dyn/libdyn.la ../../node/dyn/libdyn.la ../../node/dyn/hdyn/libhdyn.la ../../node/dyn/hdyn/xutil/libxhdyn.la ../../star/dstar/libdstar.la ../../node/dyn/hdyn/stubs/libstubs.la
+calculate_individual_energies_LDADD = ../dstar/libdstar.la ../../node/dyn/libdyn.la ../../node/dyn/libdyn.la ../../node/dyn/hdyn/libhdyn.la ../../node/dyn/hdyn/xutil/libxhdyn.la ../../star/dstar/libdstar.la ../../node/dyn/hdyn/stubs/libstubs.la
kingfit_SOURCES = kingfit.C
red_stellar_system_SOURCES = red_stellar_system.C
--- starlab-4.4.3/src/star/xutil/Makefile.am 2004-09-28 19:46:33.000000000 +0200
+++ starlab-4.4.3.shared/src/star/xutil/Makefile.am 2008-09-05 17:41:39.000000000 +0200
@@ -20,6 +20,7 @@ bin_PROGRAMS = xhrdplot
xhrdplot_CPPFLAGS = -DTOOLBOX
xhrdplot_LDADD = ../sstar/libsstar.la \
- ../../node/dyn/hdyn/libhdyn.la \
+ ../../node/dyn/hdyn/libhdyn.la ../../node/dyn/hdyn/xutil/libxhdyn.la ../../star/dstar/libdstar.la ../../node/dyn/hdyn/stubs/libstubs.la \
../../gfx/libgfx.la
+
xhrdplot_SOURCES = xhrdplot.C gfx_util.C dyn_util.C hrd_util.C
starlab-4.4.3-tstarplot.patch:
--- NEW FILE starlab-4.4.3-tstarplot.patch ---
Deal with starplot conflict:
file /usr/bin/starplot from install of starlab-4.4.3-1.fc8.i386 conflicts
with file from package starplot-0.95.5-1.fc8.i386
Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk>
--- starlab-4.4.3/src/node/dyn/util/starplot.C.tstarplot 2008-10-11 21:46:28.000000000 +0200
+++ starlab-4.4.3/src/node/dyn/util/starplot.C 2008-10-11 21:47:01.000000000 +0200
@@ -72,7 +72,7 @@
case 3:
kx = 1; ky = 0; break;
default:
- cerr << "starplot: k = " << k
+ cerr << "tstarplot: k = " << k
<< " illegal value; choose from {1, 2, 3}\n";
exit(0);
}
@@ -264,7 +264,7 @@
lmax = 0; // default
else
if (lmax < 0)
- cerr << "starplot: a maximum length of " << lmax
+ cerr << "tstarplot: a maximum length of " << lmax
<< " < 0 not allowed\n";
if (c_flag) cout << "\33[H\33[J\33[H";
--- starlab-4.4.3/TOOLS.tstarplot 2008-10-11 21:45:26.000000000 +0200
+++ starlab-4.4.3/TOOLS 2008-10-11 21:46:20.000000000 +0200
@@ -94,7 +94,7 @@
renumber renumber all particles sequentially
scale (re)scale an N-body system to specified M,
Q (=T/U), and E
- starplot plot input N-body system(s) on a non-graphics
+ tstarplot plot input N-body system(s) on a non-graphics
screen
sys_stats print out various diagnostic statistics on the
input system
--- NEW FILE starlab.spec ---
Name: starlab
Version: 4.4.3
Release: 3%{?dist}
Summary: A Software Environment for Collisional Stellar Dynamics
Group: Applications/Multimedia
License: GPLv2
URL: http://www.ids.ias.edu/~starlab/
Source0: http://www.ids.ias.edu/~starlab/download/%{name}-%{version}.tar.gz
Patch0: starlab-4.4.3-error.patch
Patch1: starlab-4.4.3-libdeps.patch
Patch2: starlab-4.4.3-buildcwd.patch
Patch3: starlab-4.4.3-autoconf263.patch
Patch4: starlab-4.4.3-tstarplot.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: zlib-devel
BuildRequires: libICE-devel
BuildRequires: libpng-devel
BuildRequires: libSM-devel
BuildRequires: libX11-devel
BuildRequires: libXau-devel
BuildRequires: libXdmcp-devel
BuildRequires: gcc-gfortran
BuildRequires: qt-devel >= 1:3, qt-devel < 1:4
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
%description
Starlab is a collection of modular software tools designed to simulate the
evolution of stars and stellar systems, and analyze the resulting data.
Starlab consists of a library of loosely coupled programs, sharing a common
flexible data structure, which can be combined in arbitrarily complex ways
to study the dynamics and evolution of binary and multiple star systems,
star clusters and galactic nuclei.
%package devel
Summary: Development files for starlab
Group: Development/Libraries
Requires: %{name}-libs = %{version}
%description devel
Files needed to compile and link programs against Starlab libraries.
%package libs
Summary: Development files for starlab
Group: Development/Libraries
%description libs
Starlab run-time libraries.
%prep
%setup -q
%patch0 -p1 -b .error
%patch1 -p1 -b .libdeps
%patch2 -p1 -b .buildcwd
%patch3 -p1 -b .autoconf263
%patch4 -p1 -b .tstarplot
# This was removed due to being duplicate, but references were not fixed
ln -s constants.h include/star/starlab_constants.h
%build
QTDIR="" && . /etc/profile.d/qt.sh
autoreconf -i
%configure --disable-static --enable-shared \
# TODO: Consider enabling these in future
# --enable-xreal --enable-sdyn3 --enable-sdyn
# They include a _lot_ of prebuilt stuff (by accident I assume)
make clean
# Some dependencies are really broken for shared libraries
make pkglibdir=%{_libdir} libs
make pkglibdir=%{_libdir}
%install
rm -rf $RPM_BUILD_ROOT
make pkglibdir=%{_libdir} install DESTDIR=$RPM_BUILD_ROOT
mv $RPM_BUILD_ROOT%{_bindir}/{,t}starplot
%clean
rm -rf $RPM_BUILD_ROOT
# Dear Fedora contributor,
#
# you are welcome to fix, enhance and update this package.
# Just please do not use wildcards for binaries in %%files and keep it
# exactly matching what should be installed, so that if some tool
# fails to build and the build for some reason finishes successfully,
# (though that should not happen with -error patch) we can spot the
# problem.
#
# Thanks!
%files
%defattr(-,root,root,-)
%{_bindir}/Qt_pp3
%{_bindir}/SeBa
%{_bindir}/_dyn_io
%{_bindir}/add_daughter_node
%{_bindir}/add_index
%{_bindir}/add_plummer
%{_bindir}/add_power_law
%{_bindir}/add_star
%{_bindir}/add_tidal
%{_bindir}/add_unique_index
%{_bindir}/addchydro
%{_bindir}/adddouble
%{_bindir}/addhydro
%{_bindir}/apply_plummer
%{_bindir}/calculate_individual_energies
%{_bindir}/chydro_leapfrog
%{_bindir}/coagulation
%{_bindir}/compute_com
%{_bindir}/compute_density
%{_bindir}/compute_max_cod
%{_bindir}/compute_mcom
%{_bindir}/compute_mean_cod
%{_bindir}/cutrandomsample
%{_bindir}/data
%{_bindir}/display_subtrees
%{_bindir}/dstar_state
%{_bindir}/dstar_stats
%{_bindir}/dumbp
%{_bindir}/dyn_io
%{_bindir}/dyndiff
%{_bindir}/dyndist
%{_bindir}/encountervelocity
%{_bindir}/energy
%{_bindir}/extract_snap
%{_bindir}/flat_hermite
%{_bindir}/flatten
%{_bindir}/freeze
%{_bindir}/freezebin
%{_bindir}/get_densities
%{_bindir}/get_std_center
%{_bindir}/gethist
%{_bindir}/getsnap
%{_bindir}/grow_black_hole
%{_bindir}/hdyn_io
%{_bindir}/hdyn_pp3
%{_bindir}/hop
%{_bindir}/hscale
%{_bindir}/hsys_stats
%{_bindir}/hxstarplot
%{_bindir}/hydro_leapfrog
%{_bindir}/imf_evolve
%{_bindir}/jiggle
%{_bindir}/kepler
%{_bindir}/kingfit
%{_bindir}/kira
%{_bindir}/kira_smallN
%{_bindir}/lagrad
%{_bindir}/lagradplot
%{_bindir}/lagradplotsmooth
%{_bindir}/leapfrog
%{_bindir}/list_sdumb
%{_bindir}/list_snap
%{_bindir}/lmt_to_ubvri
%{_bindir}/log_extract
%{_bindir}/m_bar
%{_bindir}/make_aniso_king
%{_bindir}/make_image
%{_bindir}/make_single_node
%{_bindir}/makebinary
%{_bindir}/makeblack_hole
%{_bindir}/makecube
%{_bindir}/makedisk
%{_bindir}/makedyn_from_input
%{_bindir}/makeheavystar
%{_bindir}/makeking
%{_bindir}/makemass
%{_bindir}/makenode
%{_bindir}/makeplanetary
%{_bindir}/makeplummer
%{_bindir}/makepovfile
%{_bindir}/makepowerlaw
%{_bindir}/makepyth
%{_bindir}/makesecondary
%{_bindir}/makesphere
%{_bindir}/makewrite
%{_bindir}/mass_dist
%{_bindir}/merge_low
%{_bindir}/merge_snaps
%{_bindir}/molecules
%{_bindir}/nn_distribution
%{_bindir}/no_xreal
%{_bindir}/node_io
%{_bindir}/nstarev
%{_bindir}/pgetopt
%{_bindir}/plot_data
%{_bindir}/plot_stars
%{_bindir}/precision
%{_bindir}/pretty_print_tree
%{_bindir}/print_id
%{_bindir}/print_normal
%{_bindir}/print_radii
%{_bindir}/print_time
%{_bindir}/proj_lagr
%{_bindir}/radial_density
%{_bindir}/radial_numdensity
%{_bindir}/radial_profile
%{_bindir}/radial_vdisp
%{_bindir}/randinter
%{_bindir}/rcore2
%{_bindir}/rdc_SeBa
%{_bindir}/readp
%{_bindir}/readp2
%{_bindir}/readstoa
%{_bindir}/rearrange_mf
%{_bindir}/red_star_cluster
%{_bindir}/red_stellar_system
%{_bindir}/reflect_velocities
%{_bindir}/renumber
%{_bindir}/reset_counters
%{_bindir}/rmq
%{_bindir}/rs_birthrate
%{_bindir}/rs_countsn
%{_bindir}/rs_findtype
%{_bindir}/rs_population
%{_bindir}/rs_reorder
%{_bindir}/rs_scenarios
%{_bindir}/rs_snapshot
%{_bindir}/runtime_help
%{_bindir}/scale
%{_bindir}/scanbinary
%{_bindir}/scanbundle
%{_bindir}/semi_to_period
%{_bindir}/set_com
%{_bindir}/set_ignore_internal
%{_bindir}/set_radius
%{_bindir}/setmass
%{_bindir}/simple
%{_bindir}/snap2speck
%{_bindir}/snap_to_image
%{_bindir}/snapprune
%{_bindir}/split_particles
%{_bindir}/sstar_stats
%{_bindir}/starev
%{_bindir}/tstarplot
%{_bindir}/std_rename_nodes
%{_bindir}/story
%{_bindir}/sync_times
%{_bindir}/sys_stats
%{_bindir}/tdyn_io
%{_bindir}/test_util
%{_bindir}/test_vector
%{_bindir}/to_com
%{_bindir}/worldlines
%{_bindir}/xhrdplot
%{_bindir}/ximage
%{_bindir}/xreal
%{_bindir}/xstarplot
%{_bindir}/xstarplot22
%{_bindir}/xtest
%doc AUTHORS COPYING TOOLS
%exclude %{_libdir}/*.la
%files libs
%defattr(-,root,root,-)
%{_libdir}/*.so.*
%doc AUTHORS COPYING
%files devel
%defattr(-,root,root,-)
%{_libdir}/*.so
%{_includedir}/*
%doc AUTHORS COPYING EXAMPLES
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
%changelog
* Sat Oct 11 2008 Lubomir Rintel (Fedora Astronomy) <lkundrak at fedoraproject.org> - 4.4.3-3
- Deal with starplot conflict. (Thanks to Marek Mahut)
* Thu Oct 9 2008 Lubomir Rintel (Fedora Astronomy) <lkundrak at fedoraproject.org> - 4.4.3-2
- Source the QT path. (Thanks to Marek Mahut)
* Sun Jun 1 2008 Lubomir Rintel (Fedora Astronomy) <lkundrak at fedoraproject.org> - 4.4.3-1
- Initial packaging for Fedora Astronomy
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/starlab/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 13 Oct 2008 01:56:52 -0000 1.1
+++ .cvsignore 13 Oct 2008 09:06:43 -0000 1.2
@@ -0,0 +1 @@
+starlab-4.4.3.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/starlab/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 13 Oct 2008 01:56:52 -0000 1.1
+++ sources 13 Oct 2008 09:06:43 -0000 1.2
@@ -0,0 +1 @@
+211f313ffbef0e7a477c234ee00b8adb starlab-4.4.3.tar.gz
- Previous message: rpms/starlab/devel import.log, NONE, 1.1 starlab-4.4.3-autoconf263.patch, NONE, 1.1 starlab-4.4.3-buildcwd.patch, NONE, 1.1 starlab-4.4.3-error.patch, NONE, 1.1 starlab-4.4.3-libdeps.patch, NONE, 1.1 starlab-4.4.3-tstarplot.patch, NONE, 1.1 starlab.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message: rpms/python-cssutils/devel cssutils-0.9.5.1-nohashbang.patch, NONE, 1.1 python-cssutils.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list