[patch 00/15] fixes for rt-test build system

[patch 00/15] fixes for rt-test build system

[Robert Schwebel]

Hi Darren,

This is a patch queue which fixes up the remaining issues with your
recently released rt-test packet. The focus of this series was on

- fixing all GNUmakefile.am files do do the right thing; there have been
  bogus Makefiles which somehow leaked into your tree

- fix 'make dist-check', which should be your preferred distribution
  tarball building mechanism in the future. Please don't do that
  manually, as the autotools make sure you don't forget half of the
  files if you use their mechanism :-)

Robert
--
 Dipl.-Ing. Robert Schwebel | http://www.pengutronix.de
 Pengutronix - Linux Solutions for Science and Industry
   Handelsregister:  Amtsgericht Hildesheim, HRA 2686
     Hannoversche Str. 2, 31134 Hildesheim, Germany
   Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9

[patch 01/15] autoreconf doesnt always do the right thing, add manual variant

[Robert Schwebel]

[-- Attachment #1: autogen_sh-no-autoreconf.diff --]
[-- Type: text/plain, Size: 2032 bytes --]

As autoreconf doesn't always recreate all necessary files, do the steps
required to create everything that's needed manually. We also need
config/m4 in order to put the autogenerated m4 files there.

Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>

---
 autogen.sh                                 |   31 ++++++++++++++++++++++++++---
 config/m4/.secret_world_domination_project |    2 +
 2 files changed, 30 insertions(+), 3 deletions(-)

Index: autogen.sh
===================================================================
--- autogen.sh.orig
+++ autogen.sh
@@ -15,9 +15,34 @@ banner() {
 	echo
 }
 
-banner "autoreconf"
 
-autoreconf --force --install --symlink -Wall || exit $?
-rm -f include/rttests_config.h.in~
+ACLOCAL=${ACLOCAL:=aclocal}
+AUTOHEADER=${AUTOHEADER:=autoheader}
+AUTOMAKE=${AUTOMAKE:=automake}
+AUTOCONF=${AUTOCONF:=autoconf}
+
+#$ACLOCAL --version | \
+#   awk -vPROG="aclocal" -vVERS=1.7\
+#   '{if ($1 == PROG) {gsub ("-.*","",$4); if ($4 < VERS) print PROG" < version "VERS"\nThis may result in errors\n"}}'
+
+#$AUTOMAKE --version | \
+#   awk -vPROG="automake" -vVERS=1.7\
+#   '{if ($1 == PROG) {gsub ("-.*","",$4); if ($4 < VERS) print PROG" < version "VERS"\nThis may result in errors\n"}}'
+
+
+#banner "running libtoolize"
+#libtoolize --force || exit
+
+banner "running aclocal"
+$ACLOCAL -I config/m4 || exit
+
+banner "running autoheader"
+$AUTOHEADER || exit
+
+banner "running automake"
+$AUTOMAKE --gnu --add-missing -Wall || exit
+
+banner "running autoconf"
+$AUTOCONF -Wall || exit
 
 banner "Finished"
Index: config/m4/.secret_world_domination_project
===================================================================
--- /dev/null
+++ config/m4/.secret_world_domination_project
@@ -0,0 +1,2 @@
+
+

--
 Dipl.-Ing. Robert Schwebel | http://www.pengutronix.de
 Pengutronix - Linux Solutions for Science and Industry
   Handelsregister:  Amtsgericht Hildesheim, HRA 2686
     Hannoversche Str. 2, 31134 Hildesheim, Germany
   Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9

Re: [patch 01/15] autoreconf doesnt always do the right thing, add manual variant

[Darren Hart]

On Tuesday 24 July 2007 02:25:18 Robert Schwebel wrote:
> As autoreconf doesn't always recreate all necessary files, do the steps
> required to create everything that's needed manually. We also need
> config/m4 in order to put the autogenerated m4 files there.

I pretty much have to take your word on that I guess - which I'm happy to do.  
It seems in slight contradiction though to your previous statement 
encouraging us to stick to the autotools defaults for distribution so as to 
allow the tools to do their job and not accidentally miss something by doing 
it manually.  Is this just a common exception to that rule?

> Index: config/m4/.secret_world_domination_project
> ===================================================================
> --- /dev/null
> +++ config/m4/.secret_world_domination_project
> @@ -0,0 +1,2 @@
> +
> +

And what is this all about? :-)

-- 
Darren Hart
IBM Linux Technology Center
Realtime Linux Team

Re: [patch 01/15] autoreconf doesnt always do the right thing, add manual variant

[Robert Schwebel]

On Tue, Jul 24, 2007 at 09:56:21AM -0700, Darren Hart wrote:
> On Tuesday 24 July 2007 02:25:18 Robert Schwebel wrote:
> > As autoreconf doesn't always recreate all necessary files, do the steps
> > required to create everything that's needed manually. We also need
> > config/m4 in order to put the autogenerated m4 files there.
> 
> I pretty much have to take your word on that I guess - which I'm happy to do.  
> It seems in slight contradiction though to your previous statement 
> encouraging us to stick to the autotools defaults for distribution so as to 
> allow the tools to do their job and not accidentally miss something by doing 
> it manually. Is this just a common exception to that rule?

We recently tried to use autoreconf to build the config files from
scratch, but although it works much better than before, we've found some
problems, so let's better stay with the proven old method.

However, Marc may be able to elaborate more about the problems; he is
our autotool wizzard :)

> > Index: config/m4/.secret_world_domination_project
> > ===================================================================
> > --- /dev/null
> > +++ config/m4/.secret_world_domination_project
> > @@ -0,0 +1,2 @@
> > +
> > +
> 
> And what is this all about? :-)

Psssst, it's secret! :)

It's just to make sure that config/m4/ is not empty, which would mean
that it would sometimes disappear.

Robert 
-- 
 Dipl.-Ing. Robert Schwebel | http://www.pengutronix.de
 Pengutronix - Linux Solutions for Science and Industry
   Handelsregister:  Amtsgericht Hildesheim, HRA 2686
     Hannoversche Str. 2, 31134 Hildesheim, Germany
   Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9

Re: [patch 01/15] autoreconf doesnt always do the right thing, add manual variant

[Marc Kleine-Budde]

Hi,

Robert Schwebel wrote:
>>> As autoreconf doesn't always recreate all necessary files, do the steps
>>> required to create everything that's needed manually. We also need
>>> config/m4 in order to put the autogenerated m4 files there.
>> I pretty much have to take your word on that I guess - which I'm happy to do.  
>> It seems in slight contradiction though to your previous statement 
>> encouraging us to stick to the autotools defaults for distribution so as to 
>> allow the tools to do their job and not accidentally miss something by doing 
>> it manually. Is this just a common exception to that rule?
> 
> We recently tried to use autoreconf to build the config files from
> scratch, but although it works much better than before, we've found some
> problems, so let's better stay with the proven old method.

Yes...

> However, Marc may be able to elaborate more about the problems; he is
> our autotool wizzard :)

I've had problems with the old debian stable a.k.a. sarge and autoreconf 
with a normal autoconf/automake/libtool package.

Robert had problems with autoreconf on debian testing (lenny) with a 
project using autoconf/automake/libtool + libltdl

>>> Index: config/m4/.secret_world_domination_project
>>> ===================================================================
>>> --- /dev/null
>>> +++ config/m4/.secret_world_domination_project
>>> @@ -0,0 +1,2 @@
>>> +
>>> +
>> And what is this all about? :-)
> 
> Psssst, it's secret! :)

> It's just to make sure that config/m4/ is not empty, which would mean
> that it would sometimes disappear.

Right - with "AC_CONFIG_MACRO_DIR([config/m4])" in configure.ac we 
instruct autoconf to put all autogenerated suff into config/m4, to keep 
the root of the project clean. If you run autogen or autoreconf this 
directory must be existent, at least with the tool when I collected our 
autoconf-skeleton (about 1,5 years ago). This file ensures that this 
directory is present.

Marc

-- 
  Dipl.-Ing. Marc Kleine-Budde | http://www.pengutronix.de
   Pengutronix - Linux Solutions for Science and Industry
     Handelsregister: Amtsgericht Hildesheim, HRA 2686
       Hannoversche Str. 2, 31134 Hildesheim, Germany
     Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9

Re: [patch 01/15] autoreconf doesnt always do the right thing, add manual variant

[Darren Hart]

On Tuesday 24 July 2007 13:01:51 you wrote:

> >>> Index: config/m4/.secret_world_domination_project
> >>> ===================================================================
> >>> --- /dev/null
> >>> +++ config/m4/.secret_world_domination_project
> >>> @@ -0,0 +1,2 @@
> >>> +
> >>> +
> >>
> >> And what is this all about? :-)
> >
> > Psssst, it's secret! :)
> >
> > It's just to make sure that config/m4/ is not empty, which would mean
> > that it would sometimes disappear.
>
> Right - with "AC_CONFIG_MACRO_DIR([config/m4])" in configure.ac we
> instruct autoconf to put all autogenerated suff into config/m4, to keep
> the root of the project clean. If you run autogen or autoreconf this
> directory must be existent, at least with the tool when I collected our
> autoconf-skeleton (about 1,5 years ago). This file ensures that this
> directory is present.

It appears that config/autoconf also needs to be present.  I have committed 
that to rcs as well.  However, is the general consensus that I should revert 
the autoconf.sh to what it was with the initial 0.3 release and remove the 
config directory from rcs ?


-- 
Darren Hart
IBM Linux Technology Center
Realtime Linux Team

Re: [patch 01/15] autoreconf doesnt always do the right thing, add manual variant

[Marc Kleine-Budde]

Darren Hart wrote:

>> Right - with "AC_CONFIG_MACRO_DIR([config/m4])" in configure.ac we
>> instruct autoconf to put all autogenerated suff into config/m4, to keep
>> the root of the project clean. If you run autogen or autoreconf this
>> directory must be existent, at least with the tool when I collected our
>> autoconf-skeleton (about 1,5 years ago). This file ensures that this
>> directory is present.

> It appears that config/autoconf also needs to be present.  I have committed 
> that to rcs as well.  However, is the general consensus that I should revert 
> the autoconf.sh to what it was with the initial 0.3 release and remove the 
> config directory from rcs ?

I mixed things up a bit. AC_CONFIG_AUX_DIR([config/autoconf]) is where 
autoconf puts its autogenerated stuff, and 
AC_CONFIG_MACRO_DIR([config/m4]) is where it's looking for additional m4 
files. All dirs need to be present.

Marc

-- 
  Dipl.-Ing. Marc Kleine-Budde | http://www.pengutronix.de
   Pengutronix - Linux Solutions for Science and Industry
     Handelsregister: Amtsgericht Hildesheim, HRA 2686
       Hannoversche Str. 2, 31134 Hildesheim, Germany
     Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9

[patch 06/15] fix cppflags vs. cflags issues

[Robert Schwebel]

[-- Attachment #1: fixup_cflags_vs_cppflags.diff --]
[-- Type: text/plain, Size: 4723 bytes --]

Put preprocessor stuff into CPPFLAGS, not into CFLAGS.

Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>

---
 func/gtod_latency/GNUmakefile.am         |    6 +++---
 func/matrix_mult/GNUmakefile.am          |    7 +++++--
 func/measurement/GNUmakefile.am          |    6 +++---
 func/periodic_cpu_load/GNUmakefile.am    |    6 +++---
 func/pi-tests/GNUmakefile.am             |   29 ++++-------------------------
 func/pthread_kill_latency/GNUmakefile.am |    8 ++++----
 func/sched_jitter/GNUmakefile.am         |    3 ++-
 7 files changed, 24 insertions(+), 41 deletions(-)

Index: func/gtod_latency/GNUmakefile.am
===================================================================
--- func/gtod_latency/GNUmakefile.am.orig
+++ func/gtod_latency/GNUmakefile.am
@@ -5,11 +5,11 @@ bin_PROGRAMS = \
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/include \
 	-I$(top_builddir)/include \
-	-I$(DESTDIR)/usr/include/nptl
+	-I$(DESTDIR)/usr/include/nptl \
+	-D_GNU_SOURCE
 
 gtod_infinite_CFLAGS = \
-	-O2 \
-	-D_GNU_SOURCE
+	-O2
 
 LDADD = \
          ${top_srcdir}/include/libjvmsim.o \
Index: func/matrix_mult/GNUmakefile.am
===================================================================
--- func/matrix_mult/GNUmakefile.am.orig
+++ func/matrix_mult/GNUmakefile.am
@@ -9,9 +9,12 @@ AM_CPPFLAGS = \
         -I$(top_builddir)/include \
         -I$(DESTDIR)/usr/include/nptl
 
+matrix_mult_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-D_GNU_SOURCE
+
 matrix_mult_CFLAGS = \
-        -O2 \
-        -D_GNU_SOURCE
+        -O2
 
 LDADD = \
          ${top_srcdir}/include/libjvmsim.o \
Index: func/measurement/GNUmakefile.am
===================================================================
--- func/measurement/GNUmakefile.am.orig
+++ func/measurement/GNUmakefile.am
@@ -6,11 +6,11 @@ bin_PROGRAMS = \
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/include \
 	-I$(top_builddir)/include \
-	-I$(DESTDIR)/usr/include/nptl
+	-I$(DESTDIR)/usr/include/nptl \
+	-D_GNU_SOURCE
 
 AM_CFLAGS = \
-	-O2 \
-	-D_GNU_SOURCE
+	-O2
 
 AM_LDFLAGS = \
 	-L$(DESTDIR)/usr/lib/nptl \
Index: func/periodic_cpu_load/GNUmakefile.am
===================================================================
--- func/periodic_cpu_load/GNUmakefile.am.orig
+++ func/periodic_cpu_load/GNUmakefile.am
@@ -6,11 +6,11 @@ bin_PROGRAMS = \
 AM_CPPFLAGS = \
         -I$(top_srcdir)/include \
         -I$(top_builddir)/include \
-        -I$(DESTDIR)/usr/include/nptl
+        -I$(DESTDIR)/usr/include/nptl \
+	-D_GNU_SOURCE
 
 AM_CFLAGS = \
-        -O2 \
-        -D_GNU_SOURCE
+        -O2
 
 AM_LDFLAGS = \
         -L$(DESTDIR)/usr/lib/nptl \
Index: func/pi-tests/GNUmakefile.am
===================================================================
--- func/pi-tests/GNUmakefile.am.orig
+++ func/pi-tests/GNUmakefile.am
@@ -19,7 +19,8 @@ endif
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/include \
 	-I$(top_builddir)/include \
-	-I$(DESTDIR)/usr/include/nptl
+	-I$(DESTDIR)/usr/include/nptl \
+	-D_GNU_SOURCE
 
 AM_CFLAGS = \
 	-O2
@@ -35,31 +36,9 @@ AM_LDFLAGS = \
         -lrt \
         -lm
 
-testpi_0_CPPFLAGS = \
-	-D_GNU_SOURCE
-
-testpi_1_CPPFLAGS = \
-	-D_GNU_SOURCE
-
-testpi_2_CPPFLAGS = \
-	-D_GNU_SOURCE
-
-testpi_4_CPPFLAGS = \
-	-D_GNU_SOURCE
-
-testpi_5_CPPFLAGS = \
-	-D_GNU_SOURCE
-
-testpi_6_CPPFLAGS = \
-        -D_GNU_SOURCE
-
-
 testpi_7_CPPFLAGS = \
-        -D_GNU_SOURCE
-
-
-sbrk_mutex_CPPFLAGS = \
-        -D_GNU_SOURCE
+	$(AM_CPPFLAGS) \
+	-I$(srcdir)
 
 MAINTAINERCLEANFILES = \
 	GNUmakefile.in
Index: func/pthread_kill_latency/GNUmakefile.am
===================================================================
--- func/pthread_kill_latency/GNUmakefile.am.orig
+++ func/pthread_kill_latency/GNUmakefile.am
@@ -5,12 +5,12 @@ endif
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/include \
 	-I$(top_builddir)/include \
-	-I$(DESTDIR)/usr/include/nptl
-
-pthread_kill_latency_CFLAGS = \
-	-O2 \
+	-I$(DESTDIR)/usr/include/nptl \
 	-D_GNU_SOURCE
 
+AM_CFLAGS = \
+	-O2
+
 LDADD = \
          ${top_srcdir}/include/libjvmsim.o \
          ${top_srcdir}/include/librt.o \
Index: func/sched_jitter/GNUmakefile.am
===================================================================
--- func/sched_jitter/GNUmakefile.am.orig
+++ func/sched_jitter/GNUmakefile.am
@@ -3,7 +3,8 @@ bin_PROGRAMS = sched_jitter
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/include \
 	-I$(top_builddir)/include \
-	-I$(DESTDIR)/usr/include/nptl
+	-I$(DESTDIR)/usr/include/nptl \
+	-D_GNU_SOURCE
 
 sched_jitter_CFLAGS = \
 	-O2

--
 Dipl.-Ing. Robert Schwebel | http://www.pengutronix.de
 Pengutronix - Linux Solutions for Science and Industry
   Handelsregister:  Amtsgericht Hildesheim, HRA 2686
     Hannoversche Str. 2, 31134 Hildesheim, Germany
   Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9

Re: [patch 06/15] fix cppflags vs. cflags issues

[Darren Hart]

On Tuesday 24 July 2007 02:25:23 you wrote:
> Put preprocessor stuff into CPPFLAGS, not into CFLAGS.
>
> Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>

Acked-by: Darren Hart <dvhltc@us.ibm.com>

>
> ---
>  func/gtod_latency/GNUmakefile.am         |    6 +++---
>  func/matrix_mult/GNUmakefile.am          |    7 +++++--
>  func/measurement/GNUmakefile.am          |    6 +++---
>  func/periodic_cpu_load/GNUmakefile.am    |    6 +++---
>  func/pi-tests/GNUmakefile.am             |   29
> ++++------------------------- func/pthread_kill_latency/GNUmakefile.am |   
> 8 ++++----
>  func/sched_jitter/GNUmakefile.am         |    3 ++-
>  7 files changed, 24 insertions(+), 41 deletions(-)
>
> Index: func/gtod_latency/GNUmakefile.am
> ===================================================================
> --- func/gtod_latency/GNUmakefile.am.orig
> +++ func/gtod_latency/GNUmakefile.am
> @@ -5,11 +5,11 @@ bin_PROGRAMS = \
>  AM_CPPFLAGS = \
>  	-I$(top_srcdir)/include \
>  	-I$(top_builddir)/include \
> -	-I$(DESTDIR)/usr/include/nptl
> +	-I$(DESTDIR)/usr/include/nptl \
> +	-D_GNU_SOURCE
>
>  gtod_infinite_CFLAGS = \
> -	-O2 \
> -	-D_GNU_SOURCE
> +	-O2
>
>  LDADD = \
>           ${top_srcdir}/include/libjvmsim.o \
> Index: func/matrix_mult/GNUmakefile.am
> ===================================================================
> --- func/matrix_mult/GNUmakefile.am.orig
> +++ func/matrix_mult/GNUmakefile.am
> @@ -9,9 +9,12 @@ AM_CPPFLAGS = \
>          -I$(top_builddir)/include \
>          -I$(DESTDIR)/usr/include/nptl
>
> +matrix_mult_CPPFLAGS = \
> +	$(AM_CPPFLAGS) \
> +	-D_GNU_SOURCE
> +
>  matrix_mult_CFLAGS = \
> -        -O2 \
> -        -D_GNU_SOURCE
> +        -O2
>
>  LDADD = \
>           ${top_srcdir}/include/libjvmsim.o \
> Index: func/measurement/GNUmakefile.am
> ===================================================================
> --- func/measurement/GNUmakefile.am.orig
> +++ func/measurement/GNUmakefile.am
> @@ -6,11 +6,11 @@ bin_PROGRAMS = \
>  AM_CPPFLAGS = \
>  	-I$(top_srcdir)/include \
>  	-I$(top_builddir)/include \
> -	-I$(DESTDIR)/usr/include/nptl
> +	-I$(DESTDIR)/usr/include/nptl \
> +	-D_GNU_SOURCE
>
>  AM_CFLAGS = \
> -	-O2 \
> -	-D_GNU_SOURCE
> +	-O2
>
>  AM_LDFLAGS = \
>  	-L$(DESTDIR)/usr/lib/nptl \
> Index: func/periodic_cpu_load/GNUmakefile.am
> ===================================================================
> --- func/periodic_cpu_load/GNUmakefile.am.orig
> +++ func/periodic_cpu_load/GNUmakefile.am
> @@ -6,11 +6,11 @@ bin_PROGRAMS = \
>  AM_CPPFLAGS = \
>          -I$(top_srcdir)/include \
>          -I$(top_builddir)/include \
> -        -I$(DESTDIR)/usr/include/nptl
> +        -I$(DESTDIR)/usr/include/nptl \
> +	-D_GNU_SOURCE
>
>  AM_CFLAGS = \
> -        -O2 \
> -        -D_GNU_SOURCE
> +        -O2
>
>  AM_LDFLAGS = \
>          -L$(DESTDIR)/usr/lib/nptl \
> Index: func/pi-tests/GNUmakefile.am
> ===================================================================
> --- func/pi-tests/GNUmakefile.am.orig
> +++ func/pi-tests/GNUmakefile.am
> @@ -19,7 +19,8 @@ endif
>  AM_CPPFLAGS = \
>  	-I$(top_srcdir)/include \
>  	-I$(top_builddir)/include \
> -	-I$(DESTDIR)/usr/include/nptl
> +	-I$(DESTDIR)/usr/include/nptl \
> +	-D_GNU_SOURCE
>
>  AM_CFLAGS = \
>  	-O2
> @@ -35,31 +36,9 @@ AM_LDFLAGS = \
>          -lrt \
>          -lm
>
> -testpi_0_CPPFLAGS = \
> -	-D_GNU_SOURCE
> -
> -testpi_1_CPPFLAGS = \
> -	-D_GNU_SOURCE
> -
> -testpi_2_CPPFLAGS = \
> -	-D_GNU_SOURCE
> -
> -testpi_4_CPPFLAGS = \
> -	-D_GNU_SOURCE
> -
> -testpi_5_CPPFLAGS = \
> -	-D_GNU_SOURCE
> -
> -testpi_6_CPPFLAGS = \
> -        -D_GNU_SOURCE
> -
> -
>  testpi_7_CPPFLAGS = \
> -        -D_GNU_SOURCE
> -
> -
> -sbrk_mutex_CPPFLAGS = \
> -        -D_GNU_SOURCE
> +	$(AM_CPPFLAGS) \
> +	-I$(srcdir)
>
>  MAINTAINERCLEANFILES = \
>  	GNUmakefile.in
> Index: func/pthread_kill_latency/GNUmakefile.am
> ===================================================================
> --- func/pthread_kill_latency/GNUmakefile.am.orig
> +++ func/pthread_kill_latency/GNUmakefile.am
> @@ -5,12 +5,12 @@ endif
>  AM_CPPFLAGS = \
>  	-I$(top_srcdir)/include \
>  	-I$(top_builddir)/include \
> -	-I$(DESTDIR)/usr/include/nptl
> -
> -pthread_kill_latency_CFLAGS = \
> -	-O2 \
> +	-I$(DESTDIR)/usr/include/nptl \
>  	-D_GNU_SOURCE
>
> +AM_CFLAGS = \
> +	-O2
> +
>  LDADD = \
>           ${top_srcdir}/include/libjvmsim.o \
>           ${top_srcdir}/include/librt.o \
> Index: func/sched_jitter/GNUmakefile.am
> ===================================================================
> --- func/sched_jitter/GNUmakefile.am.orig
> +++ func/sched_jitter/GNUmakefile.am
> @@ -3,7 +3,8 @@ bin_PROGRAMS = sched_jitter
>  AM_CPPFLAGS = \
>  	-I$(top_srcdir)/include \
>  	-I$(top_builddir)/include \
> -	-I$(DESTDIR)/usr/include/nptl
> +	-I$(DESTDIR)/usr/include/nptl \
> +	-D_GNU_SOURCE
>
>  sched_jitter_CFLAGS = \
>  	-O2
>
> --
>  Dipl.-Ing. Robert Schwebel | http://www.pengutronix.de
>  Pengutronix - Linux Solutions for Science and Industry
>    Handelsregister:  Amtsgericht Hildesheim, HRA 2686
>      Hannoversche Str. 2, 31134 Hildesheim, Germany
>    Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9



-- 
Darren Hart
IBM Linux Technology Center
Realtime Linux Team

[patch 07/15] distribute all necessary files

[Robert Schwebel]

[-- Attachment #1: distribute_all_necessary_files.diff --]
[-- Type: text/plain, Size: 1209 bytes --]

Some files are missing in the distro kit, add them. We also add config
to the list of subdirs.

Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>

---
 GNUmakefile.am               |    3 +++
 func/pi-tests/GNUmakefile.am |    3 +++
 2 files changed, 6 insertions(+)

Index: func/pi-tests/GNUmakefile.am
===================================================================
--- func/pi-tests/GNUmakefile.am.orig
+++ func/pi-tests/GNUmakefile.am
@@ -40,6 +40,9 @@ testpi_7_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
 	-I$(srcdir)
 
+EXTRA_DIST = \
+	test-skeleton.c
+
 MAINTAINERCLEANFILES = \
 	GNUmakefile.in
 
Index: GNUmakefile.am
===================================================================
--- GNUmakefile.am.orig
+++ GNUmakefile.am
@@ -1,9 +1,12 @@
 SUBDIRS = \
+	config \
         include \
         func \
         perf \
         stress
 
+EXTRA_DIST = \
+	autogen.sh
 
 MAINTAINERCLEANFILES = \
         GNUmakefile.in 

--
 Dipl.-Ing. Robert Schwebel | http://www.pengutronix.de
 Pengutronix - Linux Solutions for Science and Industry
   Handelsregister:  Amtsgericht Hildesheim, HRA 2686
     Hannoversche Str. 2, 31134 Hildesheim, Germany
   Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9

Re: [patch 07/15] distribute all necessary files

[Darren Hart]

On Tuesday 24 July 2007 02:25:24 Robert Schwebel wrote:
> Some files are missing in the distro kit, add them. We also add config
> to the list of subdirs.
>
> Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>

Acked-by: Darren Hart <dvhltc@us.ibm.com>


>
> ---
>  GNUmakefile.am               |    3 +++
>  func/pi-tests/GNUmakefile.am |    3 +++
>  2 files changed, 6 insertions(+)
>
> Index: func/pi-tests/GNUmakefile.am
> ===================================================================
> --- func/pi-tests/GNUmakefile.am.orig
> +++ func/pi-tests/GNUmakefile.am
> @@ -40,6 +40,9 @@ testpi_7_CPPFLAGS = \
>  	$(AM_CPPFLAGS) \
>  	-I$(srcdir)
>
> +EXTRA_DIST = \
> +	test-skeleton.c
> +
>  MAINTAINERCLEANFILES = \
>  	GNUmakefile.in
>
> Index: GNUmakefile.am
> ===================================================================
> --- GNUmakefile.am.orig
> +++ GNUmakefile.am
> @@ -1,9 +1,12 @@
>  SUBDIRS = \
> +	config \
>          include \
>          func \
>          perf \
>          stress
>
> +EXTRA_DIST = \
> +	autogen.sh
>
>  MAINTAINERCLEANFILES = \
>          GNUmakefile.in
>
> --
>  Dipl.-Ing. Robert Schwebel | http://www.pengutronix.de
>  Pengutronix - Linux Solutions for Science and Industry
>    Handelsregister:  Amtsgericht Hildesheim, HRA 2686
>      Hannoversche Str. 2, 31134 Hildesheim, Germany
>    Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9



-- 
Darren Hart
IBM Linux Technology Center
Realtime Linux Team

[patch 08/15] use static libs for supportlibs

[Robert Schwebel]

[-- Attachment #1: use_libs_not_ofiles.diff --]
[-- Type: text/plain, Size: 7547 bytes --]

The usual automake way for including local support libs is static
libraries, so refactore it to use them.

Note: the libs should really be renamed, because calling a local library
"librt" is a very, very bad idea.

Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>

---
 configure.ac                             |    2 ++
 func/async_handler/GNUmakefile.am        |    6 +++---
 func/gtod_latency/GNUmakefile.am         |    6 +++---
 func/matrix_mult/GNUmakefile.am          |    6 +++---
 func/periodic_cpu_load/GNUmakefile.am    |    6 +++---
 func/pi-tests/GNUmakefile.am             |    6 +++---
 func/prio-preempt/GNUmakefile.am         |    6 +++---
 func/prio-wake/GNUmakefile.am            |    6 +++---
 func/pthread_kill_latency/GNUmakefile.am |    6 +++---
 func/sched_jitter/GNUmakefile.am         |    2 +-
 func/sched_latency/GNUmakefile.am        |    6 +++---
 include/GNUmakefile.am                   |   19 +++++++++++++++++++
 12 files changed, 49 insertions(+), 28 deletions(-)

Index: func/gtod_latency/GNUmakefile.am
===================================================================
--- func/gtod_latency/GNUmakefile.am.orig
+++ func/gtod_latency/GNUmakefile.am
@@ -12,9 +12,9 @@ gtod_infinite_CFLAGS = \
 	-O2
 
 LDADD = \
-         ${top_srcdir}/include/libjvmsim.o \
-         ${top_srcdir}/include/librt.o \
-         ${top_srcdir}/include/libstats.o
+         ${top_builddir}/include/libjvmsim.a \
+         ${top_builddir}/include/librt.a \
+         ${top_builddir}/include/libstats.a
 
 LDFLAGS = \
 	-L$(DESTDIR)/usr/lib/nptl \
Index: func/matrix_mult/GNUmakefile.am
===================================================================
--- func/matrix_mult/GNUmakefile.am.orig
+++ func/matrix_mult/GNUmakefile.am
@@ -17,9 +17,9 @@ matrix_mult_CFLAGS = \
         -O2
 
 LDADD = \
-         ${top_srcdir}/include/libjvmsim.o \
-         ${top_srcdir}/include/librt.o \
-         ${top_srcdir}/include/libstats.o
+         ${top_builddir}/include/libjvmsim.a \
+         ${top_builddir}/include/librt.a \
+         ${top_builddir}/include/libstats.a
 
 matrix_mult_LDFLAGS = \
         -lpthread -lrt -lm
Index: func/periodic_cpu_load/GNUmakefile.am
===================================================================
--- func/periodic_cpu_load/GNUmakefile.am.orig
+++ func/periodic_cpu_load/GNUmakefile.am
@@ -17,9 +17,9 @@ AM_LDFLAGS = \
         -lpthread -lrt -lm
 
 periodic_cpu_load_LDADD = \
-         ${top_srcdir}/include/libjvmsim.o \
-         ${top_srcdir}/include/librt.o \
-         ${top_srcdir}/include/libstats.o
+         ${top_builddir}/include/libjvmsim.a \
+         ${top_builddir}/include/librt.a \
+         ${top_builddir}/include/libstats.a
 
 MAINTAINERCLEANFILES = \
         GNUmakefile.in
Index: func/pi-tests/GNUmakefile.am
===================================================================
--- func/pi-tests/GNUmakefile.am.orig
+++ func/pi-tests/GNUmakefile.am
@@ -25,9 +25,9 @@ AM_CPPFLAGS = \
 AM_CFLAGS = \
 	-O2
 LDADD = \
-         ${top_srcdir}/include/libjvmsim.o \
-         ${top_srcdir}/include/librt.o \
-         ${top_srcdir}/include/libstats.o
+         ${top_builddir}/include/libjvmsim.a \
+         ${top_builddir}/include/librt.a \
+         ${top_builddir}/include/libstats.a
 
 
 AM_LDFLAGS = \
Index: func/prio-preempt/GNUmakefile.am
===================================================================
--- func/prio-preempt/GNUmakefile.am.orig
+++ func/prio-preempt/GNUmakefile.am
@@ -10,9 +10,9 @@ AM_CPPFLAGS = \
 prio_preempt_CFLAGS = \
 	-O2
 LDADD = \
-         ${top_srcdir}/include/libjvmsim.o \
-         ${top_srcdir}/include/librt.o \
-         ${top_srcdir}/include/libstats.o
+         ${top_builddir}/include/libjvmsim.a \
+         ${top_builddir}/include/librt.a \
+         ${top_builddir}/include/libstats.a
 
 prio_preempt_LDFLAGS = \
         -lpthread \
Index: func/prio-wake/GNUmakefile.am
===================================================================
--- func/prio-wake/GNUmakefile.am.orig
+++ func/prio-wake/GNUmakefile.am
@@ -8,9 +8,9 @@ AM_CPPFLAGS = \
 	-I$(DESTDIR)/usr/include/nptl
 
 LDADD = \
-         ${top_srcdir}/include/libjvmsim.o \
-         ${top_srcdir}/include/librt.o \
-         ${top_srcdir}/include/libstats.o
+         ${top_builddir}/include/libjvmsim.a \
+         ${top_builddir}/include/librt.a \
+         ${top_builddir}/include/libstats.a
 
 prio_wake_CFLAGS = \
 	-O2
Index: func/pthread_kill_latency/GNUmakefile.am
===================================================================
--- func/pthread_kill_latency/GNUmakefile.am.orig
+++ func/pthread_kill_latency/GNUmakefile.am
@@ -12,9 +12,9 @@ AM_CFLAGS = \
 	-O2
 
 LDADD = \
-         ${top_srcdir}/include/libjvmsim.o \
-         ${top_srcdir}/include/librt.o \
-         ${top_srcdir}/include/libstats.o
+         ${top_builddir}/include/libjvmsim.a \
+         ${top_builddir}/include/librt.a \
+         ${top_builddir}/include/libstats.a
 
 pthread_kill_latency_LDFLAGS = \
         -lpthread -lrt -lm
Index: func/sched_jitter/GNUmakefile.am
===================================================================
--- func/sched_jitter/GNUmakefile.am.orig
+++ func/sched_jitter/GNUmakefile.am
@@ -10,7 +10,7 @@ sched_jitter_CFLAGS = \
 	-O2
 
 LDADD = \
-         ${top_srcdir}/include/libstats.o
+         ${top_builddir}/include/libstats.a
 
 sched_jitter_LDFLAGS = \
         -L/usr/lib/nptl \
Index: func/sched_latency/GNUmakefile.am
===================================================================
--- func/sched_latency/GNUmakefile.am.orig
+++ func/sched_latency/GNUmakefile.am
@@ -11,9 +11,9 @@ sched_latency_CFLAGS = \
 	-O2
 
 LDADD = \
-         ${top_srcdir}/include/libjvmsim.o \
-         ${top_srcdir}/include/librt.o \
-         ${top_srcdir}/include/libstats.o
+         ${top_builddir}/include/libjvmsim.a \
+         ${top_builddir}/include/librt.a \
+         ${top_builddir}/include/libstats.a
 
 sched_latency_LDFLAGS = \
         -L/usr/lib/nptl \
Index: include/GNUmakefile.am
===================================================================
--- /dev/null
+++ include/GNUmakefile.am
@@ -0,0 +1,19 @@
+noinst_LIBRARIES = \
+	libjvmsim.a \
+	librt.a \
+	libstats.a
+
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/include \
+	-I$(top_builddir)/include \
+	-D_GNU_SOURCE
+
+EXTRA_DIST = \
+	libjvmsim.h \
+	librt.h \
+	libstats.h \
+	list.h
+
+MAINTAINERCLEANFILES = \
+	GNUmakefile.in
+
Index: configure.ac
===================================================================
--- configure.ac.orig
+++ configure.ac
@@ -17,6 +17,8 @@ LDFLAGS="-L/usr/lib/nptl -lpthread"
 
 AM_INIT_AUTOMAKE([foreign no-exeext dist-bzip2])
 
+AC_PROG_RANLIB
+
 #
 # Checks for header files.
 #
Index: func/async_handler/GNUmakefile.am
===================================================================
--- func/async_handler/GNUmakefile.am.orig
+++ func/async_handler/GNUmakefile.am
@@ -16,9 +16,9 @@ AM_CFLAGS = \
         -D_GNU_SOURCE
 
 LDADD = \
-         ${top_srcdir}/include/libjvmsim.o \
-         ${top_srcdir}/include/librt.o \
-         ${top_srcdir}/include/libstats.o
+         ${top_builddir}/include/libjvmsim.a \
+         ${top_builddir}/include/librt.a \
+         ${top_builddir}/include/libstats.a
 
 AM_LDFLAGS = \
         -lpthread -lrt -lm

--
 Dipl.-Ing. Robert Schwebel | http://www.pengutronix.de
 Pengutronix - Linux Solutions for Science and Industry
   Handelsregister:  Amtsgericht Hildesheim, HRA 2686
     Hannoversche Str. 2, 31134 Hildesheim, Germany
   Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9

Re: [patch 08/15] use static libs for supportlibs

[Darren Hart]

On Tuesday 24 July 2007 02:25:25 Robert Schwebel wrote:
> The usual automake way for including local support libs is static
> libraries, so refactore it to use them.

We were trying to avoid libraries in a futile effort to keep the make process 
simple.... ah well.  This doesn't complicate things at all really it turns 
out, so I'm fine with it.

>
> Note: the libs should really be renamed, because calling a local library
> "librt" is a very, very bad idea.

Agreed.  We were thinking of changing it to librttest - any other suggestions?

>
> Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>

Acked-by: Darren Hart <dvhltc@us.ibm.com>

>
> ---
>  configure.ac                             |    2 ++
>  func/async_handler/GNUmakefile.am        |    6 +++---
>  func/gtod_latency/GNUmakefile.am         |    6 +++---
>  func/matrix_mult/GNUmakefile.am          |    6 +++---
>  func/periodic_cpu_load/GNUmakefile.am    |    6 +++---
>  func/pi-tests/GNUmakefile.am             |    6 +++---
>  func/prio-preempt/GNUmakefile.am         |    6 +++---
>  func/prio-wake/GNUmakefile.am            |    6 +++---
>  func/pthread_kill_latency/GNUmakefile.am |    6 +++---
>  func/sched_jitter/GNUmakefile.am         |    2 +-
>  func/sched_latency/GNUmakefile.am        |    6 +++---
>  include/GNUmakefile.am                   |   19 +++++++++++++++++++
>  12 files changed, 49 insertions(+), 28 deletions(-)
>
> Index: func/gtod_latency/GNUmakefile.am
> ===================================================================
> --- func/gtod_latency/GNUmakefile.am.orig
> +++ func/gtod_latency/GNUmakefile.am
> @@ -12,9 +12,9 @@ gtod_infinite_CFLAGS = \
>  	-O2
>
>  LDADD = \
> -         ${top_srcdir}/include/libjvmsim.o \
> -         ${top_srcdir}/include/librt.o \
> -         ${top_srcdir}/include/libstats.o
> +         ${top_builddir}/include/libjvmsim.a \
> +         ${top_builddir}/include/librt.a \
> +         ${top_builddir}/include/libstats.a
>
>  LDFLAGS = \
>  	-L$(DESTDIR)/usr/lib/nptl \
> Index: func/matrix_mult/GNUmakefile.am
> ===================================================================
> --- func/matrix_mult/GNUmakefile.am.orig
> +++ func/matrix_mult/GNUmakefile.am
> @@ -17,9 +17,9 @@ matrix_mult_CFLAGS = \
>          -O2
>
>  LDADD = \
> -         ${top_srcdir}/include/libjvmsim.o \
> -         ${top_srcdir}/include/librt.o \
> -         ${top_srcdir}/include/libstats.o
> +         ${top_builddir}/include/libjvmsim.a \
> +         ${top_builddir}/include/librt.a \
> +         ${top_builddir}/include/libstats.a
>
>  matrix_mult_LDFLAGS = \
>          -lpthread -lrt -lm
> Index: func/periodic_cpu_load/GNUmakefile.am
> ===================================================================
> --- func/periodic_cpu_load/GNUmakefile.am.orig
> +++ func/periodic_cpu_load/GNUmakefile.am
> @@ -17,9 +17,9 @@ AM_LDFLAGS = \
>          -lpthread -lrt -lm
>
>  periodic_cpu_load_LDADD = \
> -         ${top_srcdir}/include/libjvmsim.o \
> -         ${top_srcdir}/include/librt.o \
> -         ${top_srcdir}/include/libstats.o
> +         ${top_builddir}/include/libjvmsim.a \
> +         ${top_builddir}/include/librt.a \
> +         ${top_builddir}/include/libstats.a
>
>  MAINTAINERCLEANFILES = \
>          GNUmakefile.in
> Index: func/pi-tests/GNUmakefile.am
> ===================================================================
> --- func/pi-tests/GNUmakefile.am.orig
> +++ func/pi-tests/GNUmakefile.am
> @@ -25,9 +25,9 @@ AM_CPPFLAGS = \
>  AM_CFLAGS = \
>  	-O2
>  LDADD = \
> -         ${top_srcdir}/include/libjvmsim.o \
> -         ${top_srcdir}/include/librt.o \
> -         ${top_srcdir}/include/libstats.o
> +         ${top_builddir}/include/libjvmsim.a \
> +         ${top_builddir}/include/librt.a \
> +         ${top_builddir}/include/libstats.a
>
>
>  AM_LDFLAGS = \
> Index: func/prio-preempt/GNUmakefile.am
> ===================================================================
> --- func/prio-preempt/GNUmakefile.am.orig
> +++ func/prio-preempt/GNUmakefile.am
> @@ -10,9 +10,9 @@ AM_CPPFLAGS = \
>  prio_preempt_CFLAGS = \
>  	-O2
>  LDADD = \
> -         ${top_srcdir}/include/libjvmsim.o \
> -         ${top_srcdir}/include/librt.o \
> -         ${top_srcdir}/include/libstats.o
> +         ${top_builddir}/include/libjvmsim.a \
> +         ${top_builddir}/include/librt.a \
> +         ${top_builddir}/include/libstats.a
>
>  prio_preempt_LDFLAGS = \
>          -lpthread \
> Index: func/prio-wake/GNUmakefile.am
> ===================================================================
> --- func/prio-wake/GNUmakefile.am.orig
> +++ func/prio-wake/GNUmakefile.am
> @@ -8,9 +8,9 @@ AM_CPPFLAGS = \
>  	-I$(DESTDIR)/usr/include/nptl
>
>  LDADD = \
> -         ${top_srcdir}/include/libjvmsim.o \
> -         ${top_srcdir}/include/librt.o \
> -         ${top_srcdir}/include/libstats.o
> +         ${top_builddir}/include/libjvmsim.a \
> +         ${top_builddir}/include/librt.a \
> +         ${top_builddir}/include/libstats.a
>
>  prio_wake_CFLAGS = \
>  	-O2
> Index: func/pthread_kill_latency/GNUmakefile.am
> ===================================================================
> --- func/pthread_kill_latency/GNUmakefile.am.orig
> +++ func/pthread_kill_latency/GNUmakefile.am
> @@ -12,9 +12,9 @@ AM_CFLAGS = \
>  	-O2
>
>  LDADD = \
> -         ${top_srcdir}/include/libjvmsim.o \
> -         ${top_srcdir}/include/librt.o \
> -         ${top_srcdir}/include/libstats.o
> +         ${top_builddir}/include/libjvmsim.a \
> +         ${top_builddir}/include/librt.a \
> +         ${top_builddir}/include/libstats.a
>
>  pthread_kill_latency_LDFLAGS = \
>          -lpthread -lrt -lm
> Index: func/sched_jitter/GNUmakefile.am
> ===================================================================
> --- func/sched_jitter/GNUmakefile.am.orig
> +++ func/sched_jitter/GNUmakefile.am
> @@ -10,7 +10,7 @@ sched_jitter_CFLAGS = \
>  	-O2
>
>  LDADD = \
> -         ${top_srcdir}/include/libstats.o
> +         ${top_builddir}/include/libstats.a
>
>  sched_jitter_LDFLAGS = \
>          -L/usr/lib/nptl \
> Index: func/sched_latency/GNUmakefile.am
> ===================================================================
> --- func/sched_latency/GNUmakefile.am.orig
> +++ func/sched_latency/GNUmakefile.am
> @@ -11,9 +11,9 @@ sched_latency_CFLAGS = \
>  	-O2
>
>  LDADD = \
> -         ${top_srcdir}/include/libjvmsim.o \
> -         ${top_srcdir}/include/librt.o \
> -         ${top_srcdir}/include/libstats.o
> +         ${top_builddir}/include/libjvmsim.a \
> +         ${top_builddir}/include/librt.a \
> +         ${top_builddir}/include/libstats.a
>
>  sched_latency_LDFLAGS = \
>          -L/usr/lib/nptl \
> Index: include/GNUmakefile.am
> ===================================================================
> --- /dev/null
> +++ include/GNUmakefile.am
> @@ -0,0 +1,19 @@
> +noinst_LIBRARIES = \
> +	libjvmsim.a \
> +	librt.a \
> +	libstats.a
> +
> +AM_CPPFLAGS = \
> +	-I$(top_srcdir)/include \
> +	-I$(top_builddir)/include \
> +	-D_GNU_SOURCE
> +
> +EXTRA_DIST = \
> +	libjvmsim.h \
> +	librt.h \
> +	libstats.h \
> +	list.h
> +
> +MAINTAINERCLEANFILES = \
> +	GNUmakefile.in
> +
> Index: configure.ac
> ===================================================================
> --- configure.ac.orig
> +++ configure.ac
> @@ -17,6 +17,8 @@ LDFLAGS="-L/usr/lib/nptl -lpthread"
>
>  AM_INIT_AUTOMAKE([foreign no-exeext dist-bzip2])
>
> +AC_PROG_RANLIB
> +
>  #
>  # Checks for header files.
>  #
> Index: func/async_handler/GNUmakefile.am
> ===================================================================
> --- func/async_handler/GNUmakefile.am.orig
> +++ func/async_handler/GNUmakefile.am
> @@ -16,9 +16,9 @@ AM_CFLAGS = \
>          -D_GNU_SOURCE
>
>  LDADD = \
> -         ${top_srcdir}/include/libjvmsim.o \
> -         ${top_srcdir}/include/librt.o \
> -         ${top_srcdir}/include/libstats.o
> +         ${top_builddir}/include/libjvmsim.a \
> +         ${top_builddir}/include/librt.a \
> +         ${top_builddir}/include/libstats.a
>
>  AM_LDFLAGS = \
>          -lpthread -lrt -lm
>
> --
>  Dipl.-Ing. Robert Schwebel | http://www.pengutronix.de
>  Pengutronix - Linux Solutions for Science and Industry
>    Handelsregister:  Amtsgericht Hildesheim, HRA 2686
>      Hannoversche Str. 2, 31134 Hildesheim, Germany
>    Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9



-- 
Darren Hart
IBM Linux Technology Center
Realtime Linux Team

Re: [patch 08/15] use static libs for supportlibs

[Robert Schwebel]

On Tue, Jul 24, 2007 at 01:59:05PM -0700, Darren Hart wrote:
> We were trying to avoid libraries in a futile effort to keep the make
> process simple.... ah well.  This doesn't complicate things at all
> really it turns out, so I'm fine with it.

That's why I made it static libs - that's simple and works without
libtool.

> > Note: the libs should really be renamed, because calling a local library
> > "librt" is a very, very bad idea.
> 
> Agreed.  We were thinking of changing it to librttest - any other suggestions?

Sounds good. You should also think about taking it out of include/ and
put it into something like lib/ or libs/.

Robert
-- 
 Dipl.-Ing. Robert Schwebel | http://www.pengutronix.de
 Pengutronix - Linux Solutions for Science and Industry
   Handelsregister:  Amtsgericht Hildesheim, HRA 2686
     Hannoversche Str. 2, 31134 Hildesheim, Germany
   Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9

Re: [patch 08/15] use static libs for supportlibs

[Darren Hart]

On Tuesday 24 July 2007 14:14:19 Robert Schwebel wrote:
> On Tue, Jul 24, 2007 at 01:59:05PM -0700, Darren Hart wrote:
> > We were trying to avoid libraries in a futile effort to keep the make
> > process simple.... ah well.  This doesn't complicate things at all
> > really it turns out, so I'm fine with it.
>
> That's why I made it static libs - that's simple and works without
> libtool.
>
> > > Note: the libs should really be renamed, because calling a local
> > > library "librt" is a very, very bad idea.
> >
> > Agreed.  We were thinking of changing it to librttest - any other
> > suggestions?
>
> Sounds good. You should also think about taking it out of include/ and
> put it into something like lib/ or libs/.

Agreed, they started out as just header files - but they evolved into the 
static libraries they are now - time to rename and move them indeed.

-- 
Darren Hart
IBM Linux Technology Center
Realtime Linux Team

[patch 09/15] add a makefile for stress/pi-tests

[Robert Schwebel]

[-- Attachment #1: add_makefile_stress_pi_tests.diff --]
[-- Type: text/plain, Size: 1050 bytes --]

This directory should have a GNUmakefile.am.

Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>

---
 stress/pi-tests/GNUmakefile.am |   22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

Index: stress/pi-tests/GNUmakefile.am
===================================================================
--- /dev/null
+++ stress/pi-tests/GNUmakefile.am
@@ -0,0 +1,22 @@
+bin_PROGRAMS = \
+	testpi-3 \
+	lookup_pi_state
+
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/include \
+	-I$(top_builddir)/include \
+	-I$(DESTDIR)/usr/include/nptl \
+	-D_GNU_SOURCE
+
+AM_CFLAGS = \
+	-O2
+
+LDADD = \
+	$(top_builddir)/include/libjvmsim.a \
+	$(top_builddir)/include/librt.a \
+	$(top_builddir)/include/libstats.a \
+	-lpthread -lrt -lm
+
+MAINTAINERCLEANFILES = \
+	GNUmakefile.in
+

--
 Dipl.-Ing. Robert Schwebel | http://www.pengutronix.de
 Pengutronix - Linux Solutions for Science and Industry
   Handelsregister:  Amtsgericht Hildesheim, HRA 2686
     Hannoversche Str. 2, 31134 Hildesheim, Germany
   Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9

Re: [patch 09/15] add a makefile for stress/pi-tests

[Darren Hart]

On Tuesday 24 July 2007 02:25:26 Robert Schwebel wrote:
> This directory should have a GNUmakefile.am.
>
> Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>

Acked-by: Darren Hart <dvhltc@us.ibm.com>

>
> ---
>  stress/pi-tests/GNUmakefile.am |   22 ++++++++++++++++++++++
>  1 file changed, 22 insertions(+)
>
> Index: stress/pi-tests/GNUmakefile.am
> ===================================================================
> --- /dev/null
> +++ stress/pi-tests/GNUmakefile.am
> @@ -0,0 +1,22 @@
> +bin_PROGRAMS = \
> +	testpi-3 \
> +	lookup_pi_state
> +
> +AM_CPPFLAGS = \
> +	-I$(top_srcdir)/include \
> +	-I$(top_builddir)/include \
> +	-I$(DESTDIR)/usr/include/nptl \
> +	-D_GNU_SOURCE
> +
> +AM_CFLAGS = \
> +	-O2
> +
> +LDADD = \
> +	$(top_builddir)/include/libjvmsim.a \
> +	$(top_builddir)/include/librt.a \
> +	$(top_builddir)/include/libstats.a \
> +	-lpthread -lrt -lm
> +
> +MAINTAINERCLEANFILES = \
> +	GNUmakefile.in
> +
>
> --
>  Dipl.-Ing. Robert Schwebel | http://www.pengutronix.de
>  Pengutronix - Linux Solutions for Science and Industry
>    Handelsregister:  Amtsgericht Hildesheim, HRA 2686
>      Hannoversche Str. 2, 31134 Hildesheim, Germany
>    Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9



-- 
Darren Hart
IBM Linux Technology Center
Realtime Linux Team

[patch 10/15] fixup maintainerclean

[Robert Schwebel]

[-- Attachment #1: complete_maintainerclean.diff --]
[-- Type: text/plain, Size: 966 bytes --]

Add some more things which have to be cleaned on maintainer-clean; this
does also remove directories in the case that something went wrong
during development, leaving the tree in a non-clean state.

Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>

---
 GNUmakefile.am |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Index: GNUmakefile.am
===================================================================
--- GNUmakefile.am.orig
+++ GNUmakefile.am
@@ -9,5 +9,10 @@ EXTRA_DIST = \
 	autogen.sh
 
 MAINTAINERCLEANFILES = \
-        GNUmakefile.in 
+	GNUmakefile.in \
+	$(DIST_ARCHIVES)
+
+maintainer-clean-local:
+	-chmod -R a+rw $(distdir)
+	-rm -fr $(distdir)
 

--
 Dipl.-Ing. Robert Schwebel | http://www.pengutronix.de
 Pengutronix - Linux Solutions for Science and Industry
   Handelsregister:  Amtsgericht Hildesheim, HRA 2686
     Hannoversche Str. 2, 31134 Hildesheim, Germany
   Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9

Re: [patch 10/15] fixup maintainerclean

[Darren Hart]

On Tuesday 24 July 2007 02:25:27 Robert Schwebel wrote:
> Add some more things which have to be cleaned on maintainer-clean; this
> does also remove directories in the case that something went wrong
> during development, leaving the tree in a non-clean state.
>

Couple questions on this one - we do have to understand it to maintain it :-)

> Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
>
> ---
>  GNUmakefile.am |    7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
>
> Index: GNUmakefile.am
> ===================================================================
> --- GNUmakefile.am.orig
> +++ GNUmakefile.am
> @@ -9,5 +9,10 @@ EXTRA_DIST = \
>  	autogen.sh
>
>  MAINTAINERCLEANFILES = \
> -        GNUmakefile.in
> +	GNUmakefile.in \
> +	$(DIST_ARCHIVES)

What are these?

> +
> +maintainer-clean-local:
> +	-chmod -R a+rw $(distdir)
> +	-rm -fr $(distdir)

And this?

>
>
> --
>  Dipl.-Ing. Robert Schwebel | http://www.pengutronix.de
>  Pengutronix - Linux Solutions for Science and Industry
>    Handelsregister:  Amtsgericht Hildesheim, HRA 2686
>      Hannoversche Str. 2, 31134 Hildesheim, Germany
>    Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9



-- 
Darren Hart
IBM Linux Technology Center
Realtime Linux Team

Re: [patch 10/15] fixup maintainerclean

[Robert Schwebel]

On Tue, Jul 24, 2007 at 02:27:03PM -0700, Darren Hart wrote:
> On Tuesday 24 July 2007 02:25:27 Robert Schwebel wrote:
> > Add some more things which have to be cleaned on maintainer-clean; this
> > does also remove directories in the case that something went wrong
> > during development, leaving the tree in a non-clean state.
> >
> 
> Couple questions on this one - we do have to understand it to maintain it :-)
> 
> > Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
> >
> > ---
> >  GNUmakefile.am |    7 ++++++-
> >  1 file changed, 6 insertions(+), 1 deletion(-)
> >
> > Index: GNUmakefile.am
> > ===================================================================
> > --- GNUmakefile.am.orig
> > +++ GNUmakefile.am
> > @@ -9,5 +9,10 @@ EXTRA_DIST = \
> >  	autogen.sh
> >
> >  MAINTAINERCLEANFILES = \
> > -        GNUmakefile.in
> > +	GNUmakefile.in \
> > +	$(DIST_ARCHIVES)
> 
> What are these?

"make dist" creates rt-tests-x.y.tar.{bz2,gz}. This entry removes them
if you do a "make maintainer-clean" (which you wanna do before checking
stuff into some rcs.

> > +
> > +maintainer-clean-local:
> > +	-chmod -R a+rw $(distdir)
> > +	-rm -fr $(distdir)
> 
> And this?

On "make distcheck" the autotools build the tarballs, extract them
again, into a temporary directory called like the package, make the
sources read only, create an out-of-tree directory, run configure there,
build and cleanup afterwards. If everything goes right, the temporary
directory is removed again. If something goes wrong, it remains there.
This entry instructs "make maintainer-clean" to make the directory
read/write again, then remove it.

This is a handy shortcut which makes sure that, after make
maintainer-clean, everything is back to the state where it can be
checked in.

Robert
-- 
 Dipl.-Ing. Robert Schwebel | http://www.pengutronix.de
 Pengutronix - Linux Solutions for Science and Industry
   Handelsregister:  Amtsgericht Hildesheim, HRA 2686
     Hannoversche Str. 2, 31134 Hildesheim, Germany
   Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9

Re: [patch 10/15] fixup maintainerclean

[Darren Hart]

On Tuesday 24 July 2007 16:11:58 Robert Schwebel wrote:
> On Tue, Jul 24, 2007 at 02:27:03PM -0700, Darren Hart wrote:
> > On Tuesday 24 July 2007 02:25:27 Robert Schwebel wrote:
> > > Add some more things which have to be cleaned on maintainer-clean; this
> > > does also remove directories in the case that something went wrong
> > > during development, leaving the tree in a non-clean state.
> >
> > Couple questions on this one - we do have to understand it to maintain it
> > :-)
> >
> > > Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>


Acked-by: Darren Hart <dvhltc@us.ibm.com>


> > >
> > > ---
> > >  GNUmakefile.am |    7 ++++++-
> > >  1 file changed, 6 insertions(+), 1 deletion(-)
> > >
> > > Index: GNUmakefile.am
> > > ===================================================================
> > > --- GNUmakefile.am.orig
> > > +++ GNUmakefile.am
> > > @@ -9,5 +9,10 @@ EXTRA_DIST = \
> > >  	autogen.sh
> > >
> > >  MAINTAINERCLEANFILES = \
> > > -        GNUmakefile.in
> > > +	GNUmakefile.in \
> > > +	$(DIST_ARCHIVES)
> >
> > What are these?
>
> "make dist" creates rt-tests-x.y.tar.{bz2,gz}. This entry removes them
> if you do a "make maintainer-clean" (which you wanna do before checking
> stuff into some rcs.
>
> > > +
> > > +maintainer-clean-local:
> > > +	-chmod -R a+rw $(distdir)
> > > +	-rm -fr $(distdir)
> >
> > And this?
>
> On "make distcheck" the autotools build the tarballs, extract them
> again, into a temporary directory called like the package, make the
> sources read only, create an out-of-tree directory, run configure there,
> build and cleanup afterwards. If everything goes right, the temporary
> directory is removed again. If something goes wrong, it remains there.
> This entry instructs "make maintainer-clean" to make the directory
> read/write again, then remove it.
>
> This is a handy shortcut which makes sure that, after make
> maintainer-clean, everything is back to the state where it can be
> checked in.
>
> Robert



-- 
Darren Hart
IBM Linux Technology Center
Realtime Linux Team

[patch 11/15] periodic_cpuload_single needs support libs

[Robert Schwebel]

[-- Attachment #1: periodic_cpuload_single_needs_supportlibs.diff --]
[-- Type: text/plain, Size: 1031 bytes --]

This file needs the support libraries, so link against them.

Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>

---
 func/periodic_cpu_load/GNUmakefile.am |    5 +++++
 1 file changed, 5 insertions(+)

Index: func/periodic_cpu_load/GNUmakefile.am
===================================================================
--- func/periodic_cpu_load/GNUmakefile.am.orig
+++ func/periodic_cpu_load/GNUmakefile.am
@@ -21,6 +21,11 @@ periodic_cpu_load_LDADD = \
          ${top_builddir}/include/librt.a \
          ${top_builddir}/include/libstats.a
 
+periodic_cpu_load_single_LDADD = \
+	$(top_builddir)/include/libjvmsim.a \
+	$(top_builddir)/include/librt.a \
+	$(top_builddir)/include/libstats.a
+
 MAINTAINERCLEANFILES = \
         GNUmakefile.in
 

--
 Dipl.-Ing. Robert Schwebel | http://www.pengutronix.de
 Pengutronix - Linux Solutions for Science and Industry
   Handelsregister:  Amtsgericht Hildesheim, HRA 2686
     Hannoversche Str. 2, 31134 Hildesheim, Germany
   Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9

Re: [patch 11/15] periodic_cpuload_single needs support libs

[Darren Hart]

On Tuesday 24 July 2007 02:25:28 Robert Schwebel wrote:
> This file needs the support libraries, so link against them.
>
> Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>

Acked-by: Darren Hart <dvhltc@us.ibm.com>

>
> ---
>  func/periodic_cpu_load/GNUmakefile.am |    5 +++++
>  1 file changed, 5 insertions(+)
>
> Index: func/periodic_cpu_load/GNUmakefile.am
> ===================================================================
> --- func/periodic_cpu_load/GNUmakefile.am.orig
> +++ func/periodic_cpu_load/GNUmakefile.am
> @@ -21,6 +21,11 @@ periodic_cpu_load_LDADD = \
>           ${top_builddir}/include/librt.a \
>           ${top_builddir}/include/libstats.a
>
> +periodic_cpu_load_single_LDADD = \
> +	$(top_builddir)/include/libjvmsim.a \
> +	$(top_builddir)/include/librt.a \
> +	$(top_builddir)/include/libstats.a
> +
>  MAINTAINERCLEANFILES = \
>          GNUmakefile.in
>
>
> --
>  Dipl.-Ing. Robert Schwebel | http://www.pengutronix.de
>  Pengutronix - Linux Solutions for Science and Industry
>    Handelsregister:  Amtsgericht Hildesheim, HRA 2686
>      Hannoversche Str. 2, 31134 Hildesheim, Germany
>    Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9



-- 
Darren Hart
IBM Linux Technology Center
Realtime Linux Team

[patch 12/15] fix version and contact information

[Robert Schwebel]

[-- Attachment #1: fix_version_and_contact.diff --]
[-- Type: text/plain, Size: 976 bytes --]

Make sure that the packet is named correctly and bugs are reported to
the right address.

Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>

---
 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: configure.ac
===================================================================
--- configure.ac.orig
+++ configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.61)
 
-AC_INIT([rttests],[0.0.0],[bugs@pengutronix.de])
+AC_INIT([rt-test],[0.3],[linux-rt-users@vger.kernel.org])
 AC_CONFIG_HEADERS([include/rttests_config.h])
 #AC_CONFIG_SRCDIR([internal/examples/libstats_test.c])
 AC_CONFIG_MACRO_DIR([config/m4])

--
 Dipl.-Ing. Robert Schwebel | http://www.pengutronix.de
 Pengutronix - Linux Solutions for Science and Industry
   Handelsregister:  Amtsgericht Hildesheim, HRA 2686
     Hannoversche Str. 2, 31134 Hildesheim, Germany
   Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9

Re: [patch 12/15] fix version and contact information

[Darren Hart]

On Tuesday 24 July 2007 02:25:29 Robert Schwebel wrote:
> Make sure that the packet is named correctly and bugs are reported to
> the right address.
>
> Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>

Acked-by: Darren Hart <dvhltc@us.ibm.com>

>
> ---
>  configure.ac |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> Index: configure.ac
> ===================================================================
> --- configure.ac.orig
> +++ configure.ac
> @@ -2,7 +2,7 @@
>  # Process this file with autoconf to produce a configure script.
>  AC_PREREQ(2.61)
>
> -AC_INIT([rttests],[0.0.0],[bugs@pengutronix.de])
> +AC_INIT([rt-test],[0.3],[linux-rt-users@vger.kernel.org])
>  AC_CONFIG_HEADERS([include/rttests_config.h])
>  #AC_CONFIG_SRCDIR([internal/examples/libstats_test.c])
>  AC_CONFIG_MACRO_DIR([config/m4])
>
> --
>  Dipl.-Ing. Robert Schwebel | http://www.pengutronix.de
>  Pengutronix - Linux Solutions for Science and Industry
>    Handelsregister:  Amtsgericht Hildesheim, HRA 2686
>      Hannoversche Str. 2, 31134 Hildesheim, Germany
>    Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9



-- 
Darren Hart
IBM Linux Technology Center
Realtime Linux Team

[patch 13/15] cleanup makefile generation

[Robert Schwebel]

[-- Attachment #1: generate_all_makefiles.diff --]
[-- Type: text/plain, Size: 2251 bytes --]

Provides a consistent list of autogenerated make files.

Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>

---
 configure.ac |   45 +++++++++++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 20 deletions(-)

Index: configure.ac
===================================================================
--- configure.ac.orig
+++ configure.ac
@@ -69,24 +69,29 @@ if test "${CONFIG_DEBUG}" = "yes"; then
 else
     CFLAGS="${CFLAGS} -O2"
 fi
-AC_CONFIG_FILES([GNUmakefile
-		 config/GNUmakefile
-                 func/GNUmakefile
-                 func/async_handler/GNUmakefile
-                 func/matrix_mult/GNUmakefile
-                 func/measurement/GNUmakefile
-                 func/gtod_latency/GNUmakefile
-                 func/pi-tests/GNUmakefile
-                 func/prio-preempt/GNUmakefile
-                 func/prio-wake/GNUmakefile
-                 func/pthread_kill_latency/GNUmakefile
-                 func/sched_football/GNUmakefile
-                 func/sched_jitter/GNUmakefile
-                 func/sched_latency/GNUmakefile
-                 func/thread_clock/GNUmakefile
-                 include/GNUmakefile
-                 perf/GNUmakefile
-                 perf/latency/GNUmakefile
-		 stress/GNUmakefile
-                 stress/pi-tests/GNUmakefile])
+
+AC_CONFIG_FILES([
+		include/GNUmakefile
+		config/GNUmakefile
+		stress/pi-tests/GNUmakefile
+		stress/GNUmakefile
+		GNUmakefile
+		perf/latency/GNUmakefile
+		perf/GNUmakefile
+		func/sched_latency/GNUmakefile
+		func/async_handler/GNUmakefile
+		func/sched_jitter/GNUmakefile
+		func/sched_football/GNUmakefile
+		func/matrix_mult/GNUmakefile
+		func/pi-tests/GNUmakefile
+		func/prio-wake/GNUmakefile
+		func/measurement/GNUmakefile
+		func/gtod_latency/GNUmakefile
+		func/pthread_kill_latency/GNUmakefile
+		func/periodic_cpu_load/GNUmakefile
+		func/GNUmakefile
+		func/prio-preempt/GNUmakefile
+		func/thread_clock/GNUmakefile
+])
+
 AC_OUTPUT

--
 Dipl.-Ing. Robert Schwebel | http://www.pengutronix.de
 Pengutronix - Linux Solutions for Science and Industry
   Handelsregister:  Amtsgericht Hildesheim, HRA 2686
     Hannoversche Str. 2, 31134 Hildesheim, Germany
   Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9

Re: [patch 13/15] cleanup makefile generation

[Darren Hart]

On Tuesday 24 July 2007 02:25:30 Robert Schwebel wrote:
> Provides a consistent list of autogenerated make files.
>
> Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>

Acked-by: Darren Hart <dvhltc@us.ibm.com>


>
> ---
>  configure.ac |   45 +++++++++++++++++++++++++--------------------
>  1 file changed, 25 insertions(+), 20 deletions(-)
>
> Index: configure.ac
> ===================================================================
> --- configure.ac.orig
> +++ configure.ac
> @@ -69,24 +69,29 @@ if test "${CONFIG_DEBUG}" = "yes"; then
>  else
>      CFLAGS="${CFLAGS} -O2"
>  fi
> -AC_CONFIG_FILES([GNUmakefile
> -		 config/GNUmakefile
> -                 func/GNUmakefile
> -                 func/async_handler/GNUmakefile
> -                 func/matrix_mult/GNUmakefile
> -                 func/measurement/GNUmakefile
> -                 func/gtod_latency/GNUmakefile
> -                 func/pi-tests/GNUmakefile
> -                 func/prio-preempt/GNUmakefile
> -                 func/prio-wake/GNUmakefile
> -                 func/pthread_kill_latency/GNUmakefile
> -                 func/sched_football/GNUmakefile
> -                 func/sched_jitter/GNUmakefile
> -                 func/sched_latency/GNUmakefile
> -                 func/thread_clock/GNUmakefile
> -                 include/GNUmakefile
> -                 perf/GNUmakefile
> -                 perf/latency/GNUmakefile
> -		 stress/GNUmakefile
> -                 stress/pi-tests/GNUmakefile])
> +
> +AC_CONFIG_FILES([
> +		include/GNUmakefile
> +		config/GNUmakefile
> +		stress/pi-tests/GNUmakefile
> +		stress/GNUmakefile
> +		GNUmakefile
> +		perf/latency/GNUmakefile
> +		perf/GNUmakefile
> +		func/sched_latency/GNUmakefile
> +		func/async_handler/GNUmakefile
> +		func/sched_jitter/GNUmakefile
> +		func/sched_football/GNUmakefile
> +		func/matrix_mult/GNUmakefile
> +		func/pi-tests/GNUmakefile
> +		func/prio-wake/GNUmakefile
> +		func/measurement/GNUmakefile
> +		func/gtod_latency/GNUmakefile
> +		func/pthread_kill_latency/GNUmakefile
> +		func/periodic_cpu_load/GNUmakefile
> +		func/GNUmakefile
> +		func/prio-preempt/GNUmakefile
> +		func/thread_clock/GNUmakefile
> +])
> +
>  AC_OUTPUT
>
> --
>  Dipl.-Ing. Robert Schwebel | http://www.pengutronix.de
>  Pengutronix - Linux Solutions for Science and Industry
>    Handelsregister:  Amtsgericht Hildesheim, HRA 2686
>      Hannoversche Str. 2, 31134 Hildesheim, Germany
>    Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9



-- 
Darren Hart
IBM Linux Technology Center
Realtime Linux Team

[patch 14/15] remove bogus characters from makefile

[Robert Schwebel]

[-- Attachment #1: remove_bogus_characters.diff --]
[-- Type: text/plain, Size: 775 bytes --]

Subject says it all ...

Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>

---
 func/periodic_cpu_load/GNUmakefile.am |    6 ------
 1 file changed, 6 deletions(-)

Index: func/periodic_cpu_load/GNUmakefile.am
===================================================================
--- func/periodic_cpu_load/GNUmakefile.am.orig
+++ func/periodic_cpu_load/GNUmakefile.am
@@ -29,9 +29,3 @@ periodic_cpu_load_single_LDADD = \
 MAINTAINERCLEANFILES = \
         GNUmakefile.in
 
-~
-~
-~
-~
-~
-

--
 Dipl.-Ing. Robert Schwebel | http://www.pengutronix.de
 Pengutronix - Linux Solutions for Science and Industry
   Handelsregister:  Amtsgericht Hildesheim, HRA 2686
     Hannoversche Str. 2, 31134 Hildesheim, Germany
   Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9

Re: [patch 14/15] remove bogus characters from makefile

[Darren Hart]

On Tuesday 24 July 2007 02:25:31 Robert Schwebel wrote:
> Subject says it all ...
>
> Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>

Acked-by: Darren Hart <dvhltc@us.ibm.com>


>
> ---
>  func/periodic_cpu_load/GNUmakefile.am |    6 ------
>  1 file changed, 6 deletions(-)
>
> Index: func/periodic_cpu_load/GNUmakefile.am
> ===================================================================
> --- func/periodic_cpu_load/GNUmakefile.am.orig
> +++ func/periodic_cpu_load/GNUmakefile.am
> @@ -29,9 +29,3 @@ periodic_cpu_load_single_LDADD = \
>  MAINTAINERCLEANFILES = \
>          GNUmakefile.in
>
> -~
> -~
> -~
> -~
> -~
> -
>
> --
>  Dipl.-Ing. Robert Schwebel | http://www.pengutronix.de
>  Pengutronix - Linux Solutions for Science and Industry
>    Handelsregister:  Amtsgericht Hildesheim, HRA 2686
>      Hannoversche Str. 2, 31134 Hildesheim, Germany
>    Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9



-- 
Darren Hart
IBM Linux Technology Center
Realtime Linux Team

[patch 15/15] coding style fixes

[Robert Schwebel]

[-- Attachment #1: fixup_codingstyle.diff --]
[-- Type: text/plain, Size: 11187 bytes --]

The coding style was really messed up all over the tree. This patch
collects all changes to refactor Makefiles in a sane way.

Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>

---
 GNUmakefile.am                           |    8 ++++----
 config/GNUmakefile.am                    |    2 +-
 func/GNUmakefile.am                      |   27 +++++++++++++--------------
 func/async_handler/GNUmakefile.am        |   24 +++++++++++-------------
 func/gtod_latency/GNUmakefile.am         |   10 +++-------
 func/gtod_latency/GNUmakefile.am.rej     |   21 ---------------------
 func/matrix_mult/GNUmakefile.am          |    6 +++---
 func/measurement/GNUmakefile.am          |    3 +--
 func/periodic_cpu_load/GNUmakefile.am    |    6 +++---
 func/pi-tests/GNUmakefile.am             |   14 +++++++-------
 func/prio-preempt/GNUmakefile.am         |   13 +++++++------
 func/prio-wake/GNUmakefile.am            |   13 ++++++-------
 func/pthread_kill_latency/GNUmakefile.am |    8 ++++----
 func/sched_jitter/GNUmakefile.am         |   11 +++++------
 func/sched_latency/GNUmakefile.am        |   15 +++++++--------
 perf/GNUmakefile.am                      |    1 +
 stress/GNUmakefile.am                    |    5 ++---
 17 files changed, 78 insertions(+), 109 deletions(-)

Index: func/gtod_latency/GNUmakefile.am
===================================================================
--- func/gtod_latency/GNUmakefile.am.orig
+++ func/gtod_latency/GNUmakefile.am
@@ -12,9 +12,9 @@ gtod_infinite_CFLAGS = \
 	-O2
 
 LDADD = \
-         ${top_builddir}/include/libjvmsim.a \
-         ${top_builddir}/include/librt.a \
-         ${top_builddir}/include/libstats.a
+         $(top_builddir)/include/libjvmsim.a \
+         $(top_builddir)/include/librt.a \
+         $(top_builddir)/include/libstats.a
 
 LDFLAGS = \
 	-L$(DESTDIR)/usr/lib/nptl \
@@ -23,10 +23,6 @@ LDFLAGS = \
 gtod_latency_CFLAGS = \
 	-O2
 
-#rdtsc_latency_LDADD = \
-#	-L$(DESTDIR)/usr/lib/nptl \
-#	-lpthread -lrt -lm
-
 MAINTAINERCLEANFILES = \
 	GNUmakefile.in
 
Index: func/matrix_mult/GNUmakefile.am
===================================================================
--- func/matrix_mult/GNUmakefile.am.orig
+++ func/matrix_mult/GNUmakefile.am
@@ -17,9 +17,9 @@ matrix_mult_CFLAGS = \
         -O2
 
 LDADD = \
-         ${top_builddir}/include/libjvmsim.a \
-         ${top_builddir}/include/librt.a \
-         ${top_builddir}/include/libstats.a
+	$(top_builddir)/include/libjvmsim.a \
+	$(top_builddir)/include/librt.a \
+	$(top_builddir)/include/libstats.a
 
 matrix_mult_LDFLAGS = \
         -lpthread -lrt -lm
Index: func/measurement/GNUmakefile.am
===================================================================
--- func/measurement/GNUmakefile.am.orig
+++ func/measurement/GNUmakefile.am
@@ -1,7 +1,6 @@
-
 bin_PROGRAMS = \
 	preempt_timing \
-	rdtsc-latency 
+	rdtsc-latency
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/include \
Index: func/periodic_cpu_load/GNUmakefile.am
===================================================================
--- func/periodic_cpu_load/GNUmakefile.am.orig
+++ func/periodic_cpu_load/GNUmakefile.am
@@ -17,9 +17,9 @@ AM_LDFLAGS = \
         -lpthread -lrt -lm
 
 periodic_cpu_load_LDADD = \
-         ${top_builddir}/include/libjvmsim.a \
-         ${top_builddir}/include/librt.a \
-         ${top_builddir}/include/libstats.a
+	$(top_builddir)/include/libjvmsim.a \
+	$(top_builddir)/include/librt.a \
+	$(top_builddir)/include/libstats.a
 
 periodic_cpu_load_single_LDADD = \
 	$(top_builddir)/include/libjvmsim.a \
Index: func/pi-tests/GNUmakefile.am
===================================================================
--- func/pi-tests/GNUmakefile.am.orig
+++ func/pi-tests/GNUmakefile.am
@@ -24,17 +24,17 @@ AM_CPPFLAGS = \
 
 AM_CFLAGS = \
 	-O2
-LDADD = \
-         ${top_builddir}/include/libjvmsim.a \
-         ${top_builddir}/include/librt.a \
-         ${top_builddir}/include/libstats.a
 
+LDADD = \
+	$(top_builddir)/include/libjvmsim.a \
+	$(top_builddir)/include/librt.a \
+	$(top_builddir)/include/libstats.a
 
 AM_LDFLAGS = \
 	-L$(DESTDIR)/usr/lib/nptl \
-        -lpthread \
-        -lrt \
-        -lm
+	-lpthread \
+	-lrt \
+	-lm
 
 testpi_7_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
Index: func/prio-preempt/GNUmakefile.am
===================================================================
--- func/prio-preempt/GNUmakefile.am.orig
+++ func/prio-preempt/GNUmakefile.am
@@ -9,15 +9,16 @@ AM_CPPFLAGS = \
 
 prio_preempt_CFLAGS = \
 	-O2
+
 LDADD = \
-         ${top_builddir}/include/libjvmsim.a \
-         ${top_builddir}/include/librt.a \
-         ${top_builddir}/include/libstats.a
+	$(top_builddir)/include/libjvmsim.a \
+	$(top_builddir)/include/librt.a \
+	$(top_builddir)/include/libstats.a
 
 prio_preempt_LDFLAGS = \
-        -lpthread \
-        -lrt \
-        -lm
+	-lpthread \
+	-lrt \
+	-lm
 
 MAINTAINERCLEANFILES = \
 	GNUmakefile.in
Index: func/prio-wake/GNUmakefile.am
===================================================================
--- func/prio-wake/GNUmakefile.am.orig
+++ func/prio-wake/GNUmakefile.am
@@ -8,18 +8,17 @@ AM_CPPFLAGS = \
 	-I$(DESTDIR)/usr/include/nptl
 
 LDADD = \
-         ${top_builddir}/include/libjvmsim.a \
-         ${top_builddir}/include/librt.a \
-         ${top_builddir}/include/libstats.a
+	$(top_builddir)/include/libjvmsim.a \
+	$(top_builddir)/include/librt.a \
+	$(top_builddir)/include/libstats.a
 
 prio_wake_CFLAGS = \
 	-O2
 
 prio_wake_LDFLAGS = \
-        -lpthread  \
-        -lrt  \
-        -lm
-
+	-lpthread  \
+	-lrt  \
+	-lm
 
 MAINTAINERCLEANFILES = \
 	GNUmakefile.in
Index: func/pthread_kill_latency/GNUmakefile.am
===================================================================
--- func/pthread_kill_latency/GNUmakefile.am.orig
+++ func/pthread_kill_latency/GNUmakefile.am
@@ -12,12 +12,12 @@ AM_CFLAGS = \
 	-O2
 
 LDADD = \
-         ${top_builddir}/include/libjvmsim.a \
-         ${top_builddir}/include/librt.a \
-         ${top_builddir}/include/libstats.a
+	$(top_builddir)/include/libjvmsim.a \
+	$(top_builddir)/include/librt.a \
+	$(top_builddir)/include/libstats.a
 
 pthread_kill_latency_LDFLAGS = \
-        -lpthread -lrt -lm
+	-lpthread -lrt -lm
 
 MAINTAINERCLEANFILES = \
 	GNUmakefile.in
Index: func/sched_jitter/GNUmakefile.am
===================================================================
--- func/sched_jitter/GNUmakefile.am.orig
+++ func/sched_jitter/GNUmakefile.am
@@ -10,14 +10,13 @@ sched_jitter_CFLAGS = \
 	-O2
 
 LDADD = \
-         ${top_builddir}/include/libstats.a
+	$(top_builddir)/include/libstats.a
 
 sched_jitter_LDFLAGS = \
-        -L/usr/lib/nptl \
-        -lpthread \
-        -lrt \
-        -lm
-
+	-L/usr/lib/nptl \
+	-lpthread \
+	-lrt \
+	-lm
 
 MAINTAINERCLEANFILES = \
 	GNUmakefile.in
Index: func/sched_latency/GNUmakefile.am
===================================================================
--- func/sched_latency/GNUmakefile.am.orig
+++ func/sched_latency/GNUmakefile.am
@@ -11,16 +11,15 @@ sched_latency_CFLAGS = \
 	-O2
 
 LDADD = \
-         ${top_builddir}/include/libjvmsim.a \
-         ${top_builddir}/include/librt.a \
-         ${top_builddir}/include/libstats.a
+	$(top_builddir)/include/libjvmsim.a \
+	$(top_builddir)/include/librt.a \
+	$(top_builddir)/include/libstats.a
 
 sched_latency_LDFLAGS = \
-        -L/usr/lib/nptl \
-        -lpthread \
-        -lrt \
-        -lm
-
+	-L/usr/lib/nptl \
+	-lpthread \
+	-lrt \
+	-lm
 
 MAINTAINERCLEANFILES = \
 	GNUmakefile.in
Index: stress/GNUmakefile.am
===================================================================
--- stress/GNUmakefile.am.orig
+++ stress/GNUmakefile.am
@@ -1,7 +1,6 @@
 SUBDIRS = \
-        pi-tests
+	pi-tests
 
 MAINTAINERCLEANFILES = \
-        GNUmakefile.in
-
+	GNUmakefile.in
 
Index: func/async_handler/GNUmakefile.am
===================================================================
--- func/async_handler/GNUmakefile.am.orig
+++ func/async_handler/GNUmakefile.am
@@ -1,29 +1,27 @@
 if HAVE_PTHREAD_MUTEXATTR_SETPROTOCOL
 bin_PROGRAMS = \
-        async_handler \
+	async_handler \
 	async_handler_jk \
 	async_handler_tsc
 endif
 
-
 AM_CPPFLAGS = \
-        -I$(top_srcdir)/include \
-        -I$(top_builddir)/include \
-        -I$(DESTDIR)/usr/include/nptl
+	-I$(top_srcdir)/include \
+	-I$(top_builddir)/include \
+	-I$(DESTDIR)/usr/include/nptl
 
 AM_CFLAGS = \
-        -O2 \
-        -D_GNU_SOURCE
+	-O2 \
+	-D_GNU_SOURCE
 
 LDADD = \
-         ${top_builddir}/include/libjvmsim.a \
-         ${top_builddir}/include/librt.a \
-         ${top_builddir}/include/libstats.a
+	$(top_builddir)/include/libjvmsim.a \
+	$(top_builddir)/include/librt.a \
+	$(top_builddir)/include/libstats.a
 
 AM_LDFLAGS = \
-        -lpthread -lrt -lm
+	-lpthread -lrt -lm
 
 MAINTAINERCLEANFILES = \
-        GNUmakefile.in
-
+	GNUmakefile.in
 
Index: func/GNUmakefile.am
===================================================================
--- func/GNUmakefile.am.orig
+++ func/GNUmakefile.am
@@ -1,19 +1,18 @@
-SUBDIRS=\
-	async_handler\
-	gtod_latency\
-	matrix_mult\
-	measurement\
-	periodic_cpu_load\
-	pi-tests\
-	prio-preempt\
-	prio-wake\
-	pthread_kill_latency\
-	sched_football\
-	sched_jitter\
-	sched_latency\
+SUBDIRS = \
+	async_handler \
+	gtod_latency \
+	matrix_mult \
+	measurement \
+	periodic_cpu_load \
+	pi-tests \
+	prio-preempt \
+	prio-wake \
+	pthread_kill_latency \
+	sched_football \
+	sched_jitter \
+	sched_latency \
 	thread_clock
 
-
 MAINTAINERCLEANFILES = \
         GNUmakefile.in
 
Index: config/GNUmakefile.am
===================================================================
--- config/GNUmakefile.am.orig
+++ config/GNUmakefile.am
@@ -1,3 +1,3 @@
 MAINTAINERCLEANFILES = \
-        GNUmakefile.in
+	GNUmakefile.in
 
Index: GNUmakefile.am
===================================================================
--- GNUmakefile.am.orig
+++ GNUmakefile.am
@@ -1,9 +1,9 @@
 SUBDIRS = \
 	config \
-        include \
-        func \
-        perf \
-        stress
+	include \
+	func \
+	perf \
+	stress
 
 EXTRA_DIST = \
 	autogen.sh
Index: perf/GNUmakefile.am
===================================================================
--- perf/GNUmakefile.am.orig
+++ perf/GNUmakefile.am
@@ -3,3 +3,4 @@ SUBDIRS = \
 
 MAINTAINERCLEANFILES = \
 	GNUmakefile.in
+
Index: func/gtod_latency/GNUmakefile.am.rej
===================================================================
--- func/gtod_latency/GNUmakefile.am.rej
+++ /dev/null
@@ -1,21 +0,0 @@
-*************** gtod_infinite_CFLAGS = \
-*** 12,20 ****
-  	-O2
-  
-  LDADD = \
--          ${top_srcdir}/include/libjvmsim.a \
--          ${top_srcdir}/include/librt.a \
--          ${top_srcdir}/include/libstats.a
-  
-  LDFLAGS = \
-  	-L$(DESTDIR)/usr/lib/nptl \
---- 12,20 ----
-  	-O2
-  
-  LDADD = \
-+ 	$(top_srcdir)/include/libjvmsim.a \
-+ 	$(top_srcdir)/include/librt.a \
-+ 	$(top_srcdir)/include/libstats.a
-  
-  LDFLAGS = \
-  	-L$(DESTDIR)/usr/lib/nptl \

--
 Dipl.-Ing. Robert Schwebel | http://www.pengutronix.de
 Pengutronix - Linux Solutions for Science and Industry
   Handelsregister:  Amtsgericht Hildesheim, HRA 2686
     Hannoversche Str. 2, 31134 Hildesheim, Germany
   Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9

Re: [patch 15/15] coding style fixes

[Darren Hart]

On Tuesday 24 July 2007 02:25:32 Robert Schwebel wrote:
> The coding style was really messed up all over the tree. This patch
> collects all changes to refactor Makefiles in a sane way.

Took a little munging to get into svn, and had to make one more space to tabs 
conversion... Thanks for all the cleanup - very much appreciated.

>
> Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>

Acked-by: Darren Hart <dvhltc@us.ibm.com>

>
> ---
>  GNUmakefile.am                           |    8 ++++----
>  config/GNUmakefile.am                    |    2 +-
>  func/GNUmakefile.am                      |   27
> +++++++++++++-------------- func/async_handler/GNUmakefile.am        |   24
> +++++++++++------------- func/gtod_latency/GNUmakefile.am         |   10
> +++-------
>  func/gtod_latency/GNUmakefile.am.rej     |   21 ---------------------
>  func/matrix_mult/GNUmakefile.am          |    6 +++---
>  func/measurement/GNUmakefile.am          |    3 +--
>  func/periodic_cpu_load/GNUmakefile.am    |    6 +++---
>  func/pi-tests/GNUmakefile.am             |   14 +++++++-------
>  func/prio-preempt/GNUmakefile.am         |   13 +++++++------
>  func/prio-wake/GNUmakefile.am            |   13 ++++++-------
>  func/pthread_kill_latency/GNUmakefile.am |    8 ++++----
>  func/sched_jitter/GNUmakefile.am         |   11 +++++------
>  func/sched_latency/GNUmakefile.am        |   15 +++++++--------
>  perf/GNUmakefile.am                      |    1 +
>  stress/GNUmakefile.am                    |    5 ++---
>  17 files changed, 78 insertions(+), 109 deletions(-)
>
> Index: func/gtod_latency/GNUmakefile.am
> ===================================================================
> --- func/gtod_latency/GNUmakefile.am.orig
> +++ func/gtod_latency/GNUmakefile.am
> @@ -12,9 +12,9 @@ gtod_infinite_CFLAGS = \
>  	-O2
>
>  LDADD = \
> -         ${top_builddir}/include/libjvmsim.a \
> -         ${top_builddir}/include/librt.a \
> -         ${top_builddir}/include/libstats.a
> +         $(top_builddir)/include/libjvmsim.a \
> +         $(top_builddir)/include/librt.a \
> +         $(top_builddir)/include/libstats.a

Not sure if something got lost in translation... what did you change here?  I 
think you intended to make them tabs?  will merge in as tabs.

>
>  LDFLAGS = \
>  	-L$(DESTDIR)/usr/lib/nptl \
> @@ -23,10 +23,6 @@ LDFLAGS = \
>  gtod_latency_CFLAGS = \
>  	-O2
>
> -#rdtsc_latency_LDADD = \
> -#	-L$(DESTDIR)/usr/lib/nptl \
> -#	-lpthread -lrt -lm
> -
>  MAINTAINERCLEANFILES = \
>  	GNUmakefile.in
>
> Index: func/matrix_mult/GNUmakefile.am
> ===================================================================
> --- func/matrix_mult/GNUmakefile.am.orig
> +++ func/matrix_mult/GNUmakefile.am
> @@ -17,9 +17,9 @@ matrix_mult_CFLAGS = \
>          -O2
>
>  LDADD = \
> -         ${top_builddir}/include/libjvmsim.a \
> -         ${top_builddir}/include/librt.a \
> -         ${top_builddir}/include/libstats.a
> +	$(top_builddir)/include/libjvmsim.a \
> +	$(top_builddir)/include/librt.a \
> +	$(top_builddir)/include/libstats.a
>
>  matrix_mult_LDFLAGS = \
>          -lpthread -lrt -lm
> Index: func/measurement/GNUmakefile.am
> ===================================================================
> --- func/measurement/GNUmakefile.am.orig
> +++ func/measurement/GNUmakefile.am
> @@ -1,7 +1,6 @@
> -
>  bin_PROGRAMS = \
>  	preempt_timing \
> -	rdtsc-latency
> +	rdtsc-latency
>
>  AM_CPPFLAGS = \
>  	-I$(top_srcdir)/include \
> Index: func/periodic_cpu_load/GNUmakefile.am
> ===================================================================
> --- func/periodic_cpu_load/GNUmakefile.am.orig
> +++ func/periodic_cpu_load/GNUmakefile.am
> @@ -17,9 +17,9 @@ AM_LDFLAGS = \
>          -lpthread -lrt -lm
>
>  periodic_cpu_load_LDADD = \
> -         ${top_builddir}/include/libjvmsim.a \
> -         ${top_builddir}/include/librt.a \
> -         ${top_builddir}/include/libstats.a
> +	$(top_builddir)/include/libjvmsim.a \
> +	$(top_builddir)/include/librt.a \
> +	$(top_builddir)/include/libstats.a
>
>  periodic_cpu_load_single_LDADD = \
>  	$(top_builddir)/include/libjvmsim.a \
> Index: func/pi-tests/GNUmakefile.am
> ===================================================================
> --- func/pi-tests/GNUmakefile.am.orig
> +++ func/pi-tests/GNUmakefile.am
> @@ -24,17 +24,17 @@ AM_CPPFLAGS = \
>
>  AM_CFLAGS = \
>  	-O2
> -LDADD = \
> -         ${top_builddir}/include/libjvmsim.a \
> -         ${top_builddir}/include/librt.a \
> -         ${top_builddir}/include/libstats.a
>
> +LDADD = \
> +	$(top_builddir)/include/libjvmsim.a \
> +	$(top_builddir)/include/librt.a \
> +	$(top_builddir)/include/libstats.a
>
>  AM_LDFLAGS = \
>  	-L$(DESTDIR)/usr/lib/nptl \
> -        -lpthread \
> -        -lrt \
> -        -lm
> +	-lpthread \
> +	-lrt \
> +	-lm
>
>  testpi_7_CPPFLAGS = \
>  	$(AM_CPPFLAGS) \
> Index: func/prio-preempt/GNUmakefile.am
> ===================================================================
> --- func/prio-preempt/GNUmakefile.am.orig
> +++ func/prio-preempt/GNUmakefile.am
> @@ -9,15 +9,16 @@ AM_CPPFLAGS = \
>
>  prio_preempt_CFLAGS = \
>  	-O2
> +
>  LDADD = \
> -         ${top_builddir}/include/libjvmsim.a \
> -         ${top_builddir}/include/librt.a \
> -         ${top_builddir}/include/libstats.a
> +	$(top_builddir)/include/libjvmsim.a \
> +	$(top_builddir)/include/librt.a \
> +	$(top_builddir)/include/libstats.a
>
>  prio_preempt_LDFLAGS = \
> -        -lpthread \
> -        -lrt \
> -        -lm
> +	-lpthread \
> +	-lrt \
> +	-lm
>
>  MAINTAINERCLEANFILES = \
>  	GNUmakefile.in
> Index: func/prio-wake/GNUmakefile.am
> ===================================================================
> --- func/prio-wake/GNUmakefile.am.orig
> +++ func/prio-wake/GNUmakefile.am
> @@ -8,18 +8,17 @@ AM_CPPFLAGS = \
>  	-I$(DESTDIR)/usr/include/nptl
>
>  LDADD = \
> -         ${top_builddir}/include/libjvmsim.a \
> -         ${top_builddir}/include/librt.a \
> -         ${top_builddir}/include/libstats.a
> +	$(top_builddir)/include/libjvmsim.a \
> +	$(top_builddir)/include/librt.a \
> +	$(top_builddir)/include/libstats.a
>
>  prio_wake_CFLAGS = \
>  	-O2
>
>  prio_wake_LDFLAGS = \
> -        -lpthread  \
> -        -lrt  \
> -        -lm
> -
> +	-lpthread  \
> +	-lrt  \
> +	-lm
>
>  MAINTAINERCLEANFILES = \
>  	GNUmakefile.in
> Index: func/pthread_kill_latency/GNUmakefile.am
> ===================================================================
> --- func/pthread_kill_latency/GNUmakefile.am.orig
> +++ func/pthread_kill_latency/GNUmakefile.am
> @@ -12,12 +12,12 @@ AM_CFLAGS = \
>  	-O2
>
>  LDADD = \
> -         ${top_builddir}/include/libjvmsim.a \
> -         ${top_builddir}/include/librt.a \
> -         ${top_builddir}/include/libstats.a
> +	$(top_builddir)/include/libjvmsim.a \
> +	$(top_builddir)/include/librt.a \
> +	$(top_builddir)/include/libstats.a
>
>  pthread_kill_latency_LDFLAGS = \
> -        -lpthread -lrt -lm
> +	-lpthread -lrt -lm
>
>  MAINTAINERCLEANFILES = \
>  	GNUmakefile.in
> Index: func/sched_jitter/GNUmakefile.am
> ===================================================================
> --- func/sched_jitter/GNUmakefile.am.orig
> +++ func/sched_jitter/GNUmakefile.am
> @@ -10,14 +10,13 @@ sched_jitter_CFLAGS = \
>  	-O2
>
>  LDADD = \
> -         ${top_builddir}/include/libstats.a
> +	$(top_builddir)/include/libstats.a
>
>  sched_jitter_LDFLAGS = \
> -        -L/usr/lib/nptl \
> -        -lpthread \
> -        -lrt \
> -        -lm
> -
> +	-L/usr/lib/nptl \
> +	-lpthread \
> +	-lrt \
> +	-lm
>
>  MAINTAINERCLEANFILES = \
>  	GNUmakefile.in
> Index: func/sched_latency/GNUmakefile.am
> ===================================================================
> --- func/sched_latency/GNUmakefile.am.orig
> +++ func/sched_latency/GNUmakefile.am
> @@ -11,16 +11,15 @@ sched_latency_CFLAGS = \
>  	-O2
>
>  LDADD = \
> -         ${top_builddir}/include/libjvmsim.a \
> -         ${top_builddir}/include/librt.a \
> -         ${top_builddir}/include/libstats.a
> +	$(top_builddir)/include/libjvmsim.a \
> +	$(top_builddir)/include/librt.a \
> +	$(top_builddir)/include/libstats.a
>
>  sched_latency_LDFLAGS = \
> -        -L/usr/lib/nptl \
> -        -lpthread \
> -        -lrt \
> -        -lm
> -
> +	-L/usr/lib/nptl \
> +	-lpthread \
> +	-lrt \
> +	-lm
>
>  MAINTAINERCLEANFILES = \
>  	GNUmakefile.in
> Index: stress/GNUmakefile.am
> ===================================================================
> --- stress/GNUmakefile.am.orig
> +++ stress/GNUmakefile.am
> @@ -1,7 +1,6 @@
>  SUBDIRS = \
> -        pi-tests
> +	pi-tests
>
>  MAINTAINERCLEANFILES = \
> -        GNUmakefile.in
> -
> +	GNUmakefile.in
>
> Index: func/async_handler/GNUmakefile.am
> ===================================================================
> --- func/async_handler/GNUmakefile.am.orig
> +++ func/async_handler/GNUmakefile.am
> @@ -1,29 +1,27 @@
>  if HAVE_PTHREAD_MUTEXATTR_SETPROTOCOL
>  bin_PROGRAMS = \
> -        async_handler \
> +	async_handler \
>  	async_handler_jk \
>  	async_handler_tsc
>  endif
>
> -
>  AM_CPPFLAGS = \
> -        -I$(top_srcdir)/include \
> -        -I$(top_builddir)/include \
> -        -I$(DESTDIR)/usr/include/nptl
> +	-I$(top_srcdir)/include \
> +	-I$(top_builddir)/include \
> +	-I$(DESTDIR)/usr/include/nptl
>
>  AM_CFLAGS = \
> -        -O2 \
> -        -D_GNU_SOURCE
> +	-O2 \
> +	-D_GNU_SOURCE
>
>  LDADD = \
> -         ${top_builddir}/include/libjvmsim.a \
> -         ${top_builddir}/include/librt.a \
> -         ${top_builddir}/include/libstats.a
> +	$(top_builddir)/include/libjvmsim.a \
> +	$(top_builddir)/include/librt.a \
> +	$(top_builddir)/include/libstats.a
>
>  AM_LDFLAGS = \
> -        -lpthread -lrt -lm
> +	-lpthread -lrt -lm
>
>  MAINTAINERCLEANFILES = \
> -        GNUmakefile.in
> -
> +	GNUmakefile.in
>
> Index: func/GNUmakefile.am
> ===================================================================
> --- func/GNUmakefile.am.orig
> +++ func/GNUmakefile.am
> @@ -1,19 +1,18 @@
> -SUBDIRS=\
> -	async_handler\
> -	gtod_latency\
> -	matrix_mult\
> -	measurement\
> -	periodic_cpu_load\
> -	pi-tests\
> -	prio-preempt\
> -	prio-wake\
> -	pthread_kill_latency\
> -	sched_football\
> -	sched_jitter\
> -	sched_latency\
> +SUBDIRS = \
> +	async_handler \
> +	gtod_latency \
> +	matrix_mult \
> +	measurement \
> +	periodic_cpu_load \
> +	pi-tests \
> +	prio-preempt \
> +	prio-wake \
> +	pthread_kill_latency \
> +	sched_football \
> +	sched_jitter \
> +	sched_latency \
>  	thread_clock
>
> -
>  MAINTAINERCLEANFILES = \
>          GNUmakefile.in
>
> Index: config/GNUmakefile.am
> ===================================================================
> --- config/GNUmakefile.am.orig
> +++ config/GNUmakefile.am
> @@ -1,3 +1,3 @@
>  MAINTAINERCLEANFILES = \
> -        GNUmakefile.in
> +	GNUmakefile.in
>
> Index: GNUmakefile.am
> ===================================================================
> --- GNUmakefile.am.orig
> +++ GNUmakefile.am
> @@ -1,9 +1,9 @@
>  SUBDIRS = \
>  	config \
> -        include \
> -        func \
> -        perf \
> -        stress
> +	include \
> +	func \
> +	perf \
> +	stress
>
>  EXTRA_DIST = \
>  	autogen.sh
> Index: perf/GNUmakefile.am
> ===================================================================
> --- perf/GNUmakefile.am.orig
> +++ perf/GNUmakefile.am
> @@ -3,3 +3,4 @@ SUBDIRS = \
>
>  MAINTAINERCLEANFILES = \
>  	GNUmakefile.in
> +
> Index: func/gtod_latency/GNUmakefile.am.rej
> ===================================================================
> --- func/gtod_latency/GNUmakefile.am.rej
> +++ /dev/null
> @@ -1,21 +0,0 @@
> -*************** gtod_infinite_CFLAGS = \
> -*** 12,20 ****
> -  	-O2
> -
> -  LDADD = \
> --          ${top_srcdir}/include/libjvmsim.a \
> --          ${top_srcdir}/include/librt.a \
> --          ${top_srcdir}/include/libstats.a
> -
> -  LDFLAGS = \
> -  	-L$(DESTDIR)/usr/lib/nptl \
> ---- 12,20 ----
> -  	-O2
> -
> -  LDADD = \
> -+ 	$(top_srcdir)/include/libjvmsim.a \
> -+ 	$(top_srcdir)/include/librt.a \
> -+ 	$(top_srcdir)/include/libstats.a
> -
> -  LDFLAGS = \
> -  	-L$(DESTDIR)/usr/lib/nptl \
>
> --
>  Dipl.-Ing. Robert Schwebel | http://www.pengutronix.de
>  Pengutronix - Linux Solutions for Science and Industry
>    Handelsregister:  Amtsgericht Hildesheim, HRA 2686
>      Hannoversche Str. 2, 31134 Hildesheim, Germany
>    Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9



-- 
Darren Hart
IBM Linux Technology Center
Realtime Linux Team

Re: [patch 15/15] coding style fixes

[Robert Schwebel]

On Tue, Jul 24, 2007 at 02:26:50PM -0700, Darren Hart wrote:
> > Index: func/gtod_latency/GNUmakefile.am
> > ===================================================================
> > --- func/gtod_latency/GNUmakefile.am.orig
> > +++ func/gtod_latency/GNUmakefile.am
> > @@ -12,9 +12,9 @@ gtod_infinite_CFLAGS = \
> >  	-O2
> >
> >  LDADD = \
> > -         ${top_builddir}/include/libjvmsim.a \
> > -         ${top_builddir}/include/librt.a \
> > -         ${top_builddir}/include/libstats.a
> > +         $(top_builddir)/include/libjvmsim.a \
> > +         $(top_builddir)/include/librt.a \
> > +         $(top_builddir)/include/libstats.a
> 
> Not sure if something got lost in translation... what did you change here?  I 
> think you intended to make them tabs?  will merge in as tabs.

${...} vs. $(...), plus tabs

Robert 
-- 
 Dipl.-Ing. Robert Schwebel | http://www.pengutronix.de
 Pengutronix - Linux Solutions for Science and Industry
   Handelsregister:  Amtsgericht Hildesheim, HRA 2686
     Hannoversche Str. 2, 31134 Hildesheim, Germany
   Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9

Re: [patch 00/15] fixes for rt-test build system

[Darren Hart]

On Tuesday 24 July 2007 02:25:17 Robert Schwebel wrote:
> Hi Darren,
>
> This is a patch queue which fixes up the remaining issues with your
> recently released rt-test packet. The focus of this series was on

Very much appreciated.  I am no autotools expert, so please be patient with my 
questions :-)

>
> - fixing all GNUmakefile.am files do do the right thing; there have been
>   bogus Makefiles which somehow leaked into your tree

An artifact of the migration to autotools - we caught it after the release.  
Apologies for the mess.

>
> - fix 'make dist-check', which should be your preferred distribution
>   tarball building mechanism in the future. Please don't do that
>   manually, as the autotools make sure you don't forget half of the
>   files if you use their mechanism :-)

Cool.

More comments with the patches...

-- 
Darren Hart
IBM Linux Technology Center
Realtime Linux Team

Re: [patch 00/15] fixes for rt-test build system

[Robert Schwebel]

On Tue, Jul 24, 2007 at 09:52:49AM -0700, Darren Hart wrote:
> On Tuesday 24 July 2007 02:25:17 Robert Schwebel wrote:
> > Hi Darren,
> >
> > This is a patch queue which fixes up the remaining issues with your
> > recently released rt-test packet. The focus of this series was on
> 
> Very much appreciated.  I am no autotools expert, so please be patient with my 
> questions :-)

Ok :-)

> > - fixing all GNUmakefile.am files do do the right thing; there have been
> >   bogus Makefiles which somehow leaked into your tree
> 
> An artifact of the migration to autotools - we caught it after the release.  
> Apologies for the mess.

Yup, no problem. That's what the patch queue is for ...

> > - fix 'make dist-check', which should be your preferred distribution
> >   tarball building mechanism in the future. Please don't do that
> >   manually, as the autotools make sure you don't forget half of the
> >   files if you use their mechanism :-)
> 
> Cool.

Autotools *are* cool [1]!

Robert

[1] /me waits for tglx posting a link to http://www.cafepress.com/leuksman.7112875
-- 
 Dipl.-Ing. Robert Schwebel | http://www.pengutronix.de
 Pengutronix - Linux Solutions for Science and Industry
   Handelsregister:  Amtsgericht Hildesheim, HRA 2686
     Hannoversche Str. 2, 31134 Hildesheim, Germany
   Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9

Re: [patch 00/15] fixes for rt-test build system

[Josh Triplett]

On Tue, 2007-07-24 at 19:09 +0200, Robert Schwebel wrote:
> Autotools *are* cool [1]!
> 
> Robert
> 
> [1] /me waits for tglx posting a link to http://www.cafepress.com/leuksman.7112875

Personally, I like the quote on autotools from the Freedesktop.org
bugzilla:

[DrNick] Checking if Autoconf still sucks.... yep, it does

- Josh Triplett

Re: [patch 00/15] fixes for rt-test build system

[Robert Schwebel]

On Tue, Jul 24, 2007 at 12:14:49PM -0700, Josh Triplett wrote:
> On Tue, 2007-07-24 at 19:09 +0200, Robert Schwebel wrote:
> > Autotools *are* cool [1]!
> > 
> > Robert
> > 
> > [1] /me waits for tglx posting a link to http://www.cafepress.com/leuksman.7112875
> 
> Personally, I like the quote on autotools from the Freedesktop.org
> bugzilla:
> 
> [DrNick] Checking if Autoconf still sucks.... yep, it does
> 
> - Josh Triplett

Wow, yea, let's start a flamewar :-)

Robert
-- 
 Dipl.-Ing. Robert Schwebel | http://www.pengutronix.de
 Pengutronix - Linux Solutions for Science and Industry
   Handelsregister:  Amtsgericht Hildesheim, HRA 2686
     Hannoversche Str. 2, 31134 Hildesheim, Germany
   Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9

Re: [patch 05/15] remove autogenerated files

[Robert Schwebel]

On Tue, Jul 24, 2007 at 10:45:57AM -0700, Darren Hart wrote:
> On Tuesday 24 July 2007 02:25:22 Robert Schwebel wrote:
> > Remove all files which are autogenerated from the repository.
> >
> > Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
> 
> With 1-5 applied, I got the following with autogen.sh:
> 
> configure.ac:89: required file `include/GNUmakefile.in' not found
> configure.ac:89: required file `stress/pi-tests/GNUmakefile.in' not found
> 
> However, after applying 1-15, the autogen.sh works and the build completes, so 
> I guess this is fine.
> 
> Acked-by: Darren Hart <dvhltc@us.ibm.com>

Uuuh, I didn't check if it is bisectable :) It may be due to the fact
that the "remove autogenerated" patch removes some stuff which comes in
correcgly in a later patch. However, I tried to split up the series in a
way that you can somehow understand what it does ;)

Robert
-- 
 Dipl.-Ing. Robert Schwebel | http://www.pengutronix.de
 Pengutronix - Linux Solutions for Science and Industry
   Handelsregister:  Amtsgericht Hildesheim, HRA 2686
     Hannoversche Str. 2, 31134 Hildesheim, Germany
   Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9