[brlcad-commits] SF.net SVN: brlcad:[32174] brlcad/branches/pre-7-12-6

[<sta...@us...>]

Revision: 32174
          http://brlcad.svn.sourceforge.net/brlcad/?rev=32174&view=rev
Author:   starseeker
Date:     2008-07-31 23:17:24 +0000 (Thu, 31 Jul 2008)

Log Message:
-----------
Merge in changes to get the tree back into a working state, circa 32083 as far as merging in of trunk changes.  Testing indicates there be dragons in the 32085 and 32086 changes, so prepare working base and re-attempt the subsequent merges from trunk from there.

Modified Paths:
--------------
    brlcad/branches/pre-7-12-6/configure.ac
    brlcad/branches/pre-7-12-6/misc/pkgconfig/Makefile.am
    brlcad/branches/pre-7-12-6/src/libged/Makefile.am

Removed Paths:
-------------
    brlcad/branches/pre-7-12-6/misc/pkgconfig/libpc.pc.in

Modified: brlcad/branches/pre-7-12-6/configure.ac
===================================================================
--- brlcad/branches/pre-7-12-6/configure.ac	2008-07-31 23:08:48 UTC (rev 32173)
+++ brlcad/branches/pre-7-12-6/configure.ac	2008-07-31 23:17:24 UTC (rev 32174)
@@ -3618,7 +3618,6 @@
 MULTISPECTRAL='${top_builddir}/src/libmultispectral/libmultispectral.la'
 OPTICAL='${top_builddir}/src/liboptical/liboptical.la'
 ORLE='${top_builddir}/src/liborle/liborle.la'
-PC='${top_builddir}/src/libpc/libpc.la'
 PKG='${top_builddir}/src/libpkg/libpkg.la'
 RT='${top_builddir}/src/librt/librt.la'
 SYSV='${top_builddir}/src/libsysv/libsysv.la'
@@ -3641,7 +3640,6 @@
 FB_LIBS="${BU} ${BU_LIBS} ${PKG} ${TCL} ${SOCKET} ${NSL}" # additional/optional FB_LIBS: ${TK} ${X_LIBS} ${LIBGL}
 OPTICAL_LIBS="${RT} ${RT_LIBS} ${BN} ${BN_LIBS} ${BU} ${BU_LIBS} ${TCL}"
 MULTISPECTRAL_LIBS="${OPTICAL} ${OPTICAL_LIBS} ${RT} ${RT_LIBS} ${BN} ${BN_LIBS} ${BU} ${BU_LIBS}"
-PC_LIBS="${WDB} ${WDB_LIBS}"
 DM_LIBS="${GED} ${GED_LIBS} ${RT} ${RT_LIBS} ${FB} ${FB_LIBS} ${PNG} ${TK} ${X_LIBS} ${FRAMEWORK_CARBON}"
 TCLCAD_LIBS="${GED} ${GED_LIBS} ${DM} ${DM_LIBS} ${FB} ${FB_LIBS} ${ITK} ${ITCL} ${TK} ${TCLSTUB} ${BLT} ${TCL}"
 BRLCAD_LIBS="${GED} ${GED_LIBS} ${WDB} ${WDB_LIBS} ${RT} ${RT_LIBS} ${BN} ${BN_LIBS} ${BU} ${BU_LIBS}"
@@ -3657,7 +3655,6 @@
 AC_SUBST(OPTICAL)
 AC_SUBST(ORLE)
 AC_SUBST(PKG)
-AC_SUBST(PC)
 AC_SUBST(RT)
 AC_SUBST(SYSV)
 AC_SUBST(TCLCAD)
@@ -3675,7 +3672,6 @@
 AC_SUBST(MULTISPECTRAL_LIBS)
 AC_SUBST(OPTICAL_LIBS)
 AC_SUBST(ORLE_LIBS)
-AC_SUBST(PC_LIBS)
 AC_SUBST(PKG_LIBS)
 AC_SUBST(RT_LIBS)
 AC_SUBST(SYSV_LIBS)
@@ -3743,8 +3739,7 @@
 	doc/Makefile
 	doc/book/Makefile
 	doc/docbook/Makefile
-        doc/docbook/tutorials/Makefile
-	doc/docbook/tutorials/oed/Makefile
+	doc/docbook/oed/Makefile
 	doc/html/Makefile
 	doc/html/ReleaseNotes/Makefile
 	doc/html/ReleaseNotes/Rel5.0/Makefile
@@ -3785,14 +3780,12 @@
 	misc/pkgconfig/libfft.pc
 	misc/pkgconfig/libmultispectral.pc
 	misc/pkgconfig/liboptical.pc
-	misc/pkgconfig/libpc.pc
 	misc/pkgconfig/libpkg.pc
 	misc/pkgconfig/librt.pc
 	misc/pkgconfig/libwdb.pc
 	misc/win32-msvc/Dll/Makefile
 	misc/win32-msvc/Makefile
 	misc/win32-msvc8/Makefile
-	misc/win32-msvc9/Makefile
 	pix/Makefile
 	sh/Makefile
 	src/Makefile
@@ -3863,7 +3856,6 @@
 	src/libmultispectral/Makefile
 	src/liboptical/Makefile
 	src/liborle/Makefile
-	src/libpc/Makefile
 	src/libpkg/Makefile
 	src/librt/Makefile
 	src/librtserver/Makefile

Modified: brlcad/branches/pre-7-12-6/misc/pkgconfig/Makefile.am
===================================================================
--- brlcad/branches/pre-7-12-6/misc/pkgconfig/Makefile.am	2008-07-31 23:08:48 UTC (rev 32173)
+++ brlcad/branches/pre-7-12-6/misc/pkgconfig/Makefile.am	2008-07-31 23:17:24 UTC (rev 32174)
@@ -10,7 +10,6 @@
 	libfft.pc \
 	libmultispectral.pc \
 	liboptical.pc \
-	libpc.pc \
 	libpkg.pc \
 	librt.pc \
 	libwdb.pc
@@ -24,7 +23,6 @@
 	libfft.pc.in \
 	libmultispectral.pc.in \
 	liboptical.pc.in \
-	libpc.pc.in \
 	libpkg.pc.in \
 	librt.pc.in \
 	liwdb.pc.in

Deleted: brlcad/branches/pre-7-12-6/misc/pkgconfig/libpc.pc.in
===================================================================
--- brlcad/branches/pre-7-12-6/misc/pkgconfig/libpc.pc.in	2008-07-31 23:08:48 UTC (rev 32173)
+++ brlcad/branches/pre-7-12-6/misc/pkgconfig/libpc.pc.in	2008-07-31 23:17:24 UTC (rev 32174)
@@ -1,13 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-datarootdir=@datarootdir@
-datadir=@datadir@
-
-Name: libpc
-Description: BRL-CAD Parametrics and Constraints Library
-Version: @BRLCAD_VERSION@
-Requires: librt libbn libbu
-Libs: -L${libdir} -lpc -lrt -lbn -lbu -lpc @LIBTCL@ @LIBM@
-Cflags: -I${includedir}/brlcad -I${includedir}

Modified: brlcad/branches/pre-7-12-6/src/libged/Makefile.am
===================================================================
--- brlcad/branches/pre-7-12-6/src/libged/Makefile.am	2008-07-31 23:08:48 UTC (rev 32173)
+++ brlcad/branches/pre-7-12-6/src/libged/Makefile.am	2008-07-31 23:17:24 UTC (rev 32174)
@@ -34,9 +34,7 @@
 AM_CPPFLAGS = \
 	${TCL_CPPFLAGS}
 
-noinst_HEADERS = \
-	ged_private.h \
-	qray.h
+noinst_HEADERS = qray.h
 
 libged_la_SOURCES =
 libged_la_LDFLAGS = -version-info 19:1 -no-undefined


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.