[Spread-cvs] commit: r485 - in libspreadutil/trunk: . buildtools docs include src

jonathan at spread.org jonathan at spread.org
Mon Mar 5 16:15:49 EST 2012 

Author: jonathan
Date: 2012-03-05 16:15:49 -0500 (Mon, 05 Mar 2012)
New Revision: 485

Modified:
   libspreadutil/trunk/Makefile.in
   libspreadutil/trunk/buildtools/gen_system_include.sh
   libspreadutil/trunk/configure
   libspreadutil/trunk/configure.in
   libspreadutil/trunk/docs/Makefile.in
   libspreadutil/trunk/include/Makefile.in
   libspreadutil/trunk/include/spu_alarm.h
   libspreadutil/trunk/include/spu_data_link.h
   libspreadutil/trunk/include/spu_memory.h
   libspreadutil/trunk/include/spu_objects.h
   libspreadutil/trunk/include/spu_scatter.h
   libspreadutil/trunk/include/spu_system_defs.h
   libspreadutil/trunk/src/Makefile.in
Log:
Complete name change to spu_ for headers. Fix all build problems with docs, include and libs. Fix all make install and make uninstall problems.

Modified: libspreadutil/trunk/Makefile.in
===================================================================
--- libspreadutil/trunk/Makefile.in	2012-03-05 19:45:18 UTC (rev 484)
+++ libspreadutil/trunk/Makefile.in	2012-03-05 21:15:49 UTC (rev 485)
@@ -1,4 +1,4 @@
-SUBDIRS=include src
+SUBDIRS=include src docs
 INSTALLSUBDIRS=include src docs
 BINSUBDIRS=src
 

Modified: libspreadutil/trunk/buildtools/gen_system_include.sh
===================================================================
--- libspreadutil/trunk/buildtools/gen_system_include.sh	2012-03-05 19:45:18 UTC (rev 484)
+++ libspreadutil/trunk/buildtools/gen_system_include.sh	2012-03-05 21:15:49 UTC (rev 485)
@@ -1,10 +1,10 @@
 #! /bin/sh
 
-## Generate include/system.h from src/config.h 
+## Generate include/spu_system.h from src/config.h 
 ## Includes only those defines needed for the Spread Util Library API
 ##
 ##  This script takes the path to src/config.h as its only argument and
-##  generates a file suitable for being included as <spu/system.h>.  
+##  generates a file suitable for being included as <spu_system.h>.  
 
 cat <<EOF
 /* Automatically generated by gen_system_include.sh from config.h; do not edit. */
@@ -45,7 +45,7 @@
 
 cat <<EOF
 
-#include "system_defs.h"
+#include "spu_system_defs.h"
 
 #endif /* SYSTEM_H */
 EOF

Modified: libspreadutil/trunk/configure
===================================================================
--- libspreadutil/trunk/configure	2012-03-05 19:45:18 UTC (rev 484)
+++ libspreadutil/trunk/configure	2012-03-05 21:15:49 UTC (rev 485)
@@ -10093,9 +10093,9 @@
 done
 test -n "$NROFF" || NROFF="/bin/false"
 
-	if ${NROFF} -mdoc ${srcdir}/docs/spread-util.1 >/dev/null 2>&1; then
+	if ${NROFF} -mdoc ${srcdir}/docs/libspread-util.3 >/dev/null 2>&1; then
 		MANTYPE=doc
-	elif ${NROFF} -man ${srcdir}/docs/spread-util.1 >/dev/null 2>&1; then
+	elif ${NROFF} -man ${srcdir}/docs/libspread-util.3 >/dev/null 2>&1; then
 		MANTYPE=man
 	else
 		MANTYPE=cat
@@ -10115,14 +10115,14 @@
 if test "${with_docdir+set}" = set; then
   withval=$with_docdir;
 		if test "x$withval" = xyes || test "x$withval" = xno; then
-		   docdir='${datadir}/doc/spread-util'
+		   docdir='${datadir}/doc/libspread-util'
 		else
 		   docdir="$withval"
 		fi
 
 else
 
-	  docdir='${datadir}/doc/spread-util'
+	  docdir='${datadir}/doc/libspread-util'
 
 
 fi

Modified: libspreadutil/trunk/configure.in
===================================================================
--- libspreadutil/trunk/configure.in	2012-03-05 19:45:18 UTC (rev 484)
+++ libspreadutil/trunk/configure.in	2012-03-05 21:15:49 UTC (rev 485)
@@ -651,9 +651,9 @@
 )
 if test -z "$MANTYPE"; then
 	AC_PATH_PROGS(NROFF, nroff awf, /bin/false, /usr/bin:/usr/ucb)
-	if ${NROFF} -mdoc ${srcdir}/docs/spread-util.1 >/dev/null 2>&1; then
+	if ${NROFF} -mdoc ${srcdir}/docs/libspread-util.3 >/dev/null 2>&1; then
 		MANTYPE=doc
-	elif ${NROFF} -man ${srcdir}/docs/spread-util.1 >/dev/null 2>&1; then
+	elif ${NROFF} -man ${srcdir}/docs/libspread-util.3 >/dev/null 2>&1; then
 		MANTYPE=man
 	else
 		MANTYPE=cat
@@ -672,13 +672,13 @@
 	[  --with-docdir=DIR       Where to put the documentation],
 	[ 
 		if test "x$withval" = xyes || test "x$withval" = xno; then
-		   docdir='${datadir}/doc/spread-util'
+		   docdir='${datadir}/doc/libspread-util'
 		else
 		   docdir="$withval"
 		fi
 	], 
 	[ 
-	  docdir='${datadir}/doc/spread-util' 
+	  docdir='${datadir}/doc/libspread-util' 
 	]
 )
 AC_SUBST(docdir)

Modified: libspreadutil/trunk/docs/Makefile.in
===================================================================
--- libspreadutil/trunk/docs/Makefile.in	2012-03-05 19:45:18 UTC (rev 484)
+++ libspreadutil/trunk/docs/Makefile.in	2012-03-05 21:15:49 UTC (rev 485)
@@ -29,10 +29,10 @@
 MANPAGES	= E_get_time.3.out libspread-util.3.out
 MANPAGES_IN	= E_get_time.3 libspread-util.3 
 
-PAGENAMES = E_get_time
+PAGENAMES = E_get_time libspread-util
 
 # Misc documentation files in docs/ directory that should be installed
-DOCFILES = 
+DOCFILES = Readme.txt license.txt
 
 MANTYPE		= @MANTYPE@
 
@@ -46,9 +46,9 @@
 		manpage=$(srcdir)/`echo $@ | sed 's/\.out$$//'`; \
 	fi; \
 	if test "$(MANTYPE)" = "man"; then \
-		$(FIXPATHSCMD) $${manpage} | $(PERL) $(buildtoolsdir)/mdoc2man.pl > $@; \
+		cat $${manpage} | $(PERL) $(buildtoolsdir)/mdoc2man.pl > $@; \
 	else \
-		$(FIXPATHSCMD) $${manpage} > $@; \
+		cat $${manpage} > $@; \
 	fi
 
 clean:
@@ -78,7 +78,6 @@
 install-man:
 	$(buildtoolsdir)/mkinstalldirs $(DESTDIR)$(mandir)
 	$(buildtoolsdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)3
-	$(INSTALL) -m 644 libspread-util.3.out $(DESTDIR)$(mandir)/$(mansubdir)3/libspread-util.3
 	for page in $(PAGENAMES); \
 	do \
 	  $(INSTALL) -m 644 $$page.3.out $(DESTDIR)$(mandir)/$(mansubdir)3/$$page.3; \
@@ -90,8 +89,6 @@
 	do \
 	  $(INSTALL) -m 644 $(srcdir)/$$docfile $(DESTDIR)$(docdir)/$$docfile; \
 	done
-	$(INSTALL) -m 644 $(srcdir)/../Readme.txt $(DESTDIR)$(docdir)/Readme.txt; 
-	$(INSTALL) -m 644 $(srcdir)/../license.txt $(DESTDIR)$(docdir)/license.txt; 
 
 uninstallall:	uninstall
 	-rmdir $(DESTDIR)$(sysconfdir)
@@ -102,12 +99,9 @@
 uninstall: 
 	for page in $(PAGENAMES); \
 	do \
-	  -rm -f $(DESTDIR)$(mandir)/$(mansubdir)3/$$page.3; \
+	  rm -f $(DESTDIR)$(mandir)/$(mansubdir)3/$$page.3; \
 	done
-	-rm -f $(DESTDIR)$(mandir)/$(mansubdir)3/libspread-util.3
 	for docfile in $(DOCFILES); \
 	do \
-	  -rm -f $(DESTDIR)$(docdir)/$$docfile; \
+	  rm -f $(DESTDIR)$(docdir)/$$docfile; \
 	done
-	-rm -f $(DESTDIR)$(docdir)/Readme.txt
-	-rm -f $(DESTDIR)$(docdir)/license.txt

Modified: libspreadutil/trunk/include/Makefile.in
===================================================================
--- libspreadutil/trunk/include/Makefile.in	2012-03-05 19:45:18 UTC (rev 484)
+++ libspreadutil/trunk/include/Makefile.in	2012-03-05 21:15:49 UTC (rev 485)
@@ -60,22 +60,22 @@
 ENT=@ENT@
 EXEEXT=@EXEEXT@
 
-TARGETS=system.h
+TARGETS=spu_system.h
 
-HEADER_FILES=sp_events.h system_defs.h system_defs_autoconf.h system_defs_windows.h spu_compatibility.h
+HEADER_FILES=spu_alarm.h spu_alarm_types.h spu_data_link.h spu_events.h spu_memory.h spu_objects.h spu_objects_local.h spu_scatter.h spu_system_defs.h spu_system_defs_autoconf.h spu_system_defs_windows.h
 
 all: $(TARGETS)
 
-system.h: ../src/config.h
-	$(buildtoolsdir)/gen_system_include.sh ../src/config.h > system.h
+spu_system.h: ../src/config.h
+	$(buildtoolsdir)/gen_system_include.sh ../src/config.h > spu_system.h
 
-install-headers: system.h
+install-headers: spu_system.h
 	$(buildtoolsdir)/mkinstalldirs $(DESTDIR)$(includedir)
 	for incfile in $(HEADER_FILES); \
 	do \
 	  $(INSTALL) -m 644 $(srcdir)/$$incfile $(DESTDIR)$(includedir)/$$incfile; \
 	done
-	$(INSTALL) -m 644 system.h $(DESTDIR)$(includedir)/system.h
+	$(INSTALL) -m 644 spu_system.h $(DESTDIR)$(includedir)/spu_system.h
 
 clean:
 	rm -f system.h
@@ -86,7 +86,11 @@
 install: $(TARGETS) install-headers
 
 uninstall: 
-	-rm -f $(DESTDIR)$(includedir)/sp_events.h
+	for incfile in $(HEADER_FILES); \
+	do \
+	  rm -f $(DESTDIR)$(includedir)/$$incfile; \
+	done
+	rm -f $(DESTDIR)$(includedir)/spu_system.h
 
 uninstallall:	uninstall
-	-rmdir $(DESTDIR)$(includedir)
+	echo "Will not remove include directory"

Modified: libspreadutil/trunk/include/spu_alarm.h
===================================================================
--- libspreadutil/trunk/include/spu_alarm.h	2012-03-05 19:45:18 UTC (rev 484)
+++ libspreadutil/trunk/include/spu_alarm.h	2012-03-05 21:15:49 UTC (rev 485)
@@ -37,14 +37,14 @@
 #define INC_ALARM
 
 #include <stdio.h>
-#include "system.h"
+#include "spu_system.h"
 
 /* Type for Alarm realtime handler functions */
 typedef int (alarm_realtime_handler)( int16, int32, char *, size_t, char *, size_t);
 
 
 /* This includes the custom types for each project */
-#include "alarm_types.h"
+#include "spu_alarm_types.h"
 
 /* These are always defined for any project using Alarm */
 #define		ALL		0xffffffff

Modified: libspreadutil/trunk/include/spu_data_link.h
===================================================================
--- libspreadutil/trunk/include/spu_data_link.h	2012-03-05 19:45:18 UTC (rev 484)
+++ libspreadutil/trunk/include/spu_data_link.h	2012-03-05 21:15:49 UTC (rev 485)
@@ -36,8 +36,8 @@
 #ifndef INC_DATA_LINK
 #define INC_DATA_LINK
 
-#include "system.h"
-#include "scatter.h"
+#include "spu_system.h"
+#include "spu_scatter.h"
 
 #define		MAX_PACKET_SIZE		1472    /*1472 = 1536-64 (of udp)*/
 

Modified: libspreadutil/trunk/include/spu_memory.h
===================================================================
--- libspreadutil/trunk/include/spu_memory.h	2012-03-05 19:45:18 UTC (rev 484)
+++ libspreadutil/trunk/include/spu_memory.h	2012-03-05 21:15:49 UTC (rev 485)
@@ -36,7 +36,7 @@
 #ifndef MEMORY_H
 #define MEMORY_H
 
-#include "system.h"
+#include "spu_system.h"
 
 /*******************************************************************************
  * Special Object type used for 

Modified: libspreadutil/trunk/include/spu_objects.h
===================================================================
--- libspreadutil/trunk/include/spu_objects.h	2012-03-05 19:45:18 UTC (rev 484)
+++ libspreadutil/trunk/include/spu_objects.h	2012-03-05 21:15:49 UTC (rev 485)
@@ -56,7 +56,7 @@
 
 #define FIRST_APPLICATION_OBJECT_TYPE 2
 
-#include "objects_local.h"
+#include "spu_objects_local.h"
 
 /* Special objects */
 

Modified: libspreadutil/trunk/include/spu_scatter.h
===================================================================
--- libspreadutil/trunk/include/spu_scatter.h	2012-03-05 19:45:18 UTC (rev 484)
+++ libspreadutil/trunk/include/spu_scatter.h	2012-03-05 21:15:49 UTC (rev 485)
@@ -36,7 +36,7 @@
 #ifndef INC_SCATTER
 #define INC_SCATTER
 
-#include "system.h"
+#include "spu_system.h"
 #define	MAX_SCATTER_ELEMENTS	100
 
 /* scat_element is EXACTLY as defined in iovec */

Modified: libspreadutil/trunk/include/spu_system_defs.h
===================================================================
--- libspreadutil/trunk/include/spu_system_defs.h	2012-03-05 19:45:18 UTC (rev 484)
+++ libspreadutil/trunk/include/spu_system_defs.h	2012-03-05 21:15:49 UTC (rev 485)
@@ -5,11 +5,11 @@
 
 #ifndef SPU_ARCH_PC_WIN95
 /* For non Windows systems, use standard headers and types */
-#include "system_defs_autoconf.h"
+#include "spu_system_defs_autoconf.h"
 
 #else
 /* For Windows systems, use specified types and definitions */
-#include "system_defs_windows.h"
+#include "spu_system_defs_windows.h"
 
 #endif /* SPU_ARCH_PC_WIN95 */
 

Modified: libspreadutil/trunk/src/Makefile.in
===================================================================
--- libspreadutil/trunk/src/Makefile.in	2012-03-05 19:45:18 UTC (rev 484)
+++ libspreadutil/trunk/src/Makefile.in	2012-03-05 21:15:49 UTC (rev 485)
@@ -125,9 +125,18 @@
 	$(buildtoolsdir)/mkinstalldirs $(DESTDIR)$(libdir)
 	$(INSTALL) -m 644 libspread-util.a $(DESTDIR)$(libdir)/libspread-util.a
 
-uninstall: 
+uninstall-libspread-util.dylib:	
+	-rm -f $(DESTDIR)$(libdir)/libspread-util.$(LIBFULLVERSION).dylib 
+	-rm -f $(DESTDIR)$(libdir)/libspread-util.dylib
+	-rm -f $(DESTDIR)$(libdir)/libspread-util.$(LIBVERSION).dylib
+
+uninstall-libspread-util.so:
+	-rm -f $(DESTDIR)$(libdir)/libspread-util.so.$(LIBFULLVERSION)
+	-rm -f $(DESTDIR)$(libdir)/libspread-util.so
+	-rm -f $(DESTDIR)$(libdir)/libspread-util.so.$(LIBVERSION)
+
+uninstall: uninstall- at LIBSPSO@
 	-rm -f $(DESTDIR)$(libdir)/libspread-util.a
-	-rm -f $(DESTDIR)$(libdir)/@LIBSPSO@
 
 uninstallall:	uninstall
 	-rmdir $(DESTDIR)$(libdir)

More information about the Spread-cvs mailing list