[netperf-dev] netperf2 commit notice r113 - trunk

[raj at netperf.org]

Author: raj
Date: 2007-05-14 16:59:03 -0700 (Mon, 14 May 2007)
New Revision: 113

Modified:
   trunk/Makefile.am
   trunk/Makefile.in
   trunk/configure
   trunk/configure.ac
Log:
make netperf.spec via configure

Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2007-05-14 17:00:37 UTC (rev 112)
+++ trunk/Makefile.am	2007-05-14 23:59:03 UTC (rev 113)
@@ -1,10 +1,4 @@
 
 AUTOMAKE_OPTIONS = dist-bzip2 dist-zip
 SUBDIRS = src doc
-EXTRA_DIST = README.* Release_Notes inet_ntop.c netperf.spec.in
-
-
-dist-hook:
-	rm -rf `find $(distdir) -name .svn`
-	sed -e 's|@VERSION\@|$(VERSION)|g' $(PACKAGE).spec.in > $(PACKAGE).spec
-	cp $(PACKAGE).spec $(distdir)
+EXTRA_DIST = README.* Release_Notes inet_ntop.c

Modified: trunk/Makefile.in
===================================================================
--- trunk/Makefile.in	2007-05-14 17:00:37 UTC (rev 112)
+++ trunk/Makefile.in	2007-05-14 23:59:03 UTC (rev 113)
@@ -128,12 +128,12 @@
 
 AUTOMAKE_OPTIONS = dist-bzip2 dist-zip
 SUBDIRS = src doc
-EXTRA_DIST = README.* Release_Notes inet_ntop.c netperf.spec.in
+EXTRA_DIST = README.* Release_Notes inet_ntop.c
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = netperf.spec
 DIST_SOURCES =
 
 RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
@@ -144,7 +144,8 @@
 DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \
 	COPYING ChangeLog INSTALL Makefile.am NEWS acinclude.m4 \
 	aclocal.m4 config.guess config.h.in config.sub configure \
-	configure.ac depcomp install-sh missing mkinstalldirs
+	configure.ac depcomp install-sh missing mkinstalldirs \
+	netperf.spec.in
 DIST_SUBDIRS = $(SUBDIRS)
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -183,6 +184,8 @@
 
 distclean-hdr:
 	-rm -f config.h stamp-h1
+netperf.spec: $(top_builddir)/config.status netperf.spec.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
 uninstall-info-am:
 
 # This directory's subdirectories are mostly independent; you can cd
@@ -325,7 +328,7 @@
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
 	mkdir $(distdir)
-	$(mkinstalldirs) $(distdir)/src
+	$(mkinstalldirs) $(distdir)/. $(distdir)/src
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
@@ -365,9 +368,6 @@
 	      || exit 1; \
 	  fi; \
 	done
-	$(MAKE) $(AM_MAKEFLAGS) \
-	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
-	  dist-hook
 	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
@@ -545,11 +545,6 @@
 	ps-recursive tags tags-recursive uninstall uninstall-am \
 	uninstall-info-am uninstall-info-recursive uninstall-recursive
 
-
-dist-hook:
-	rm -rf `find $(distdir) -name .svn`
-	sed -e 's|@VERSION\@|$(VERSION)|g' $(PACKAGE).spec.in > $(PACKAGE).spec
-	cp $(PACKAGE).spec $(distdir)
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

Modified: trunk/configure
===================================================================
--- trunk/configure	2007-05-14 17:00:37 UTC (rev 112)
+++ trunk/configure	2007-05-14 23:59:03 UTC (rev 113)
@@ -9075,7 +9075,7 @@
 
 
 # now spit it all out
-ac_config_files="$ac_config_files Makefile src/netperf_version.h src/Makefile doc/Makefile"
+ac_config_files="$ac_config_files Makefile src/netperf_version.h src/Makefile doc/Makefile netperf.spec"
 
 
 cat >confcache <<\_ACEOF
@@ -9660,6 +9660,7 @@
     "src/netperf_version.h") CONFIG_FILES="$CONFIG_FILES src/netperf_version.h" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
+    "netperf.spec") CONFIG_FILES="$CONFIG_FILES netperf.spec" ;;
 
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2007-05-14 17:00:37 UTC (rev 112)
+++ trunk/configure.ac	2007-05-14 23:59:03 UTC (rev 113)
@@ -640,6 +640,7 @@
 AC_CONFIG_FILES([Makefile
                  src/netperf_version.h
                  src/Makefile
-		 doc/Makefile])
+		 doc/Makefile
+                 netperf.spec])
 
 AC_OUTPUT