Johannes Stezenbach wrote: > Ludwig Nussel wrote: > > Johannes Stezenbach wrote: > > > Ludwig Nussel wrote: > > > > With all the Makefile mess, did you already consider using Automake? > > > > > > No, not for a microsecond. > > > > There are no shared libraries, no gettext and AFAIK no exotic build > > rules in dvb-apps so the Makefile.am's and configure.in should be > > small and simple. Would you accept a patch for this? (Note: the > > always wrong or missing CFLAGS and broken install targets are a PITA > > as well :-)) > > Well, from the failure reports we're not getting ;-) it seems that > hardly anyone uses the install target. > > What I don't like about automake (or rather autoconf) is that > ./configure takes longer to run that the actual build of all > in dvb-apps. I am somewhat familiar with autofoo, and I think > that most of what autoconf does is pretty useless for > Linux-only software. Sure but especially the automatic build deps generation and "make distcheck" are worth it nevertheless IMHO. Here is a proof of concept patch, only compiles util/szap/ and test/. Since there are only basic checks in configure it also doesn't take long. You need to run autoreconf -i to get ./configure. cu Ludwig -- (o_ Ludwig Nussel //\ SUSE LINUX Products GmbH, Development V_/_ http://www.suse.de/ -------------- next part -------------- Index: dvb-apps/Makefile.am =================================================================== --- /dev/null +++ dvb-apps/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = util test include Index: dvb-apps/configure.in =================================================================== --- /dev/null +++ dvb-apps/configure.in @@ -0,0 +1,35 @@ +AC_INIT([dvb-apps],[1.1.0.CVS],[linux-dvb@xxxxxxxxxxx]) +AC_CONFIG_SRCDIR([test/diseqc.c]) + +AC_PREREQ(2.53) +AM_INIT_AUTOMAKE([1.6 foreign]) + +dnl Checks for programs. +AC_PROG_CC +AC_PROG_RANLIB + +dnl Checks for header files. +AC_HEADER_STDC + +CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/include" + +dnl Use -Wall if we have gcc. +changequote(,)dnl +if test "x$GCC" = "xyes"; then + case " $CFLAGS " in + *[\ \ ]-Wall[\ \ ]*) ;; + *) CFLAGS="$CFLAGS -Wall" ;; + esac +fi +changequote([,])dnl + +AC_CONFIG_FILES([ + include/linux/Makefile + include/Makefile + Makefile + test/Makefile + util/lib/Makefile + util/Makefile + util/szap/Makefile +]) +AC_OUTPUT Index: dvb-apps/test/Makefile.am =================================================================== --- /dev/null +++ dvb-apps/test/Makefile.am @@ -0,0 +1,27 @@ +EXTRA_DIST = README + +noinst_PROGRAMS = \ + diseqc \ + set22k \ + sendburst \ + setvoltage \ + setpid \ + video \ + test_sections \ + test_sec_ne \ + test_pes \ + test_dvr \ + test_dvr_play \ + test_tt \ + test_av \ + test_av_play \ + test_vevent \ + test_stc \ + test_stillimage + +noinst_HEADERS = hex_dump.h + +test_sections_SOURCES = test_sections.c hex_dump.c +test_sec_ne_SOURCES = test_sec_ne.c hex_dump.c +test_pes_SOURCES = test_pes.c hex_dump.c +test_tt_SOURCES = test_tt.c hex_dump.c Index: dvb-apps/util/Makefile.am =================================================================== --- /dev/null +++ dvb-apps/util/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = lib szap Index: dvb-apps/util/lib/Makefile.am =================================================================== --- /dev/null +++ dvb-apps/util/lib/Makefile.am @@ -0,0 +1,4 @@ +noinst_LIBRARIES = liblnb.a + +noinst_HEADERS = lnb.h +liblnb_a_SOURCES = lnb.c Index: dvb-apps/util/szap/Makefile.am =================================================================== --- /dev/null +++ dvb-apps/util/szap/Makefile.am @@ -0,0 +1,5 @@ +AM_CPPFLAGS = -I$(top_srcdir)/util/lib -DDATADIR=\"$(datadir)\" + +bin_PROGRAMS = azap szap tzap czap femon + +szap_LDADD = $(top_builddir)/util/lib/liblnb.a Index: dvb-apps/include/Makefile.am =================================================================== --- /dev/null +++ dvb-apps/include/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = linux Index: dvb-apps/include/linux/Makefile.am =================================================================== --- /dev/null +++ dvb-apps/include/linux/Makefile.am @@ -0,0 +1,9 @@ +nobase_dist_include_HEADERS = \ + dvb/audio.h \ + dvb/ca.h \ + dvb/dmx.h \ + dvb/frontend.h \ + dvb/net.h \ + dvb/osd.h \ + dvb/version.h \ + dvb/video.h
