beast-ac.patch

   1 diff -urN beast-0.5.1.orig/Makefile.am beast-0.5.1/Makefile.am
   2 --- beast-0.5.1.orig/Makefile.am        Mon Apr 14 09:12:39 2003
   3 +++ beast-0.5.1/Makefile.am     Mon Apr 14 09:16:49 2003
   4 @@ -40,13 +40,13 @@
   5  # always built PKG_paths.h and create links
   6  stamp-h: PKG_paths.h
   7
   8 -CLEANFILES += PKG_paths.h
   9 +CLEANFILES = PKG_paths.h
  10
  11  pkgconfigdir = $(libdir)/pkgconfig
  12  pkgconfig_DATA = sfi.pc bse.pc
  13  $(pkgconfig_DATA): config.status
  14
  15 -EXTRA_DIST += $(strip  \
  16 +EXTRA_DIST = $(strip   \
  17         TODO            \
  18         COPYING.GPL     \
  19         COPYING.LGPL    \
  20 diff -urN beast-0.5.1.orig/beast-gtk/Makefile.am beast-0.5.1/beast-gtk/Makefile.am
  21 --- beast-0.5.1.orig/beast-gtk/Makefile.am      Mon Apr 14 09:12:39 2003
  22 +++ beast-0.5.1/beast-gtk/Makefile.am   Mon Apr 14 09:14:32 2003
  23 @@ -91,7 +91,7 @@
  24
  25
  26  # gen-sources
  27 -CLEANFILES += xgen-beac xgen-beac xgen-bgth xgen-bgtc xgen-belc xgen-bmh xgen-bmc xgen-bdkd
  28 +CLEANFILES = xgen-beac xgen-beac xgen-bgth xgen-bgtc xgen-belc xgen-bmh xgen-bmc xgen-bdkd
  29  bstenum_arrays.c: $(beast_headers)
  30         (cd ${srcdir} \
  31         && $(GLIB_MKENUMS) \
  32 @@ -149,7 +149,7 @@
  33              --tmplkey '  { CKEY (%s),\t\t"Name",\n  BST_STOCK_,\t\t\t\t"",\n    "tip", NULL,\n  },\n' \
  34              --needkeys $(beast_sources) $(beast_extra_sources)
  35         touch $@
  36 -beast_DEPENDENCIES += stamp-ckeycheck
  37 +beast_DEPENDENCIES = stamp-ckeycheck
  38
  39  debug_key_globs = $(top_srcdir)/beast-gtk/*.[hc] $(top_srcdir)/bse/*.[hc] $(top_srcdir)/sfi/*.[hc]
  40  bstdebugkeys.defs: @DVLBUILD@ scankeys $(debug_key_globs)
  41 @@ -184,8 +184,8 @@
  42  # extra deps
  43  $(beast_SOURCES) $(bststest_SOURCES) $(tsmview_SOURCES): bstgentypes.h
  44
  45 -EXTRA_DIST += $(beast_headers) $(beast_extra_sources) $(beast_extra_files)
  46 -MAINTAINERCLEANFILES += $(beast_built_sources)
  47 +EXTRA_DIST = $(beast_headers) $(beast_extra_sources) $(beast_extra_files)
  48 +MAINTAINERCLEANFILES = $(beast_built_sources)
  49  EXTRA_DIST += $(beast_built_sources)
  50
  51  #
  52 diff -urN beast-0.5.1.orig/beast-gtk/gxk/Makefile.am beast-0.5.1/beast-gtk/gxk/Makefile.am
  53 --- beast-0.5.1.orig/beast-gtk/gxk/Makefile.am  Mon Apr 14 09:12:39 2003
  54 +++ beast-0.5.1/beast-gtk/gxk/Makefile.am       Mon Apr 14 09:14:32 2003
  55 @@ -90,6 +90,6 @@
  56  gxktest_SOURCES = gxktest.c
  57  gxktest_LDADD = $(progs_LDADD)
  58
  59 -EXTRA_DIST += $(gxk_headers) $(gxk_extra_sources) $(gxk_built_sources)
  60 -MAINTAINERCLEANFILES += $(gxk_built_sources) $(stamp_files)
  61 -CLEANFILES += $(temp_files)
  62 +EXTRA_DIST = $(gxk_headers) $(gxk_extra_sources) $(gxk_built_sources)
  63 +MAINTAINERCLEANFILES = $(gxk_built_sources) $(stamp_files)
  64 +CLEANFILES = $(temp_files)
  65 diff -urN beast-0.5.1.orig/beast-gtk/icons/Makefile.am beast-0.5.1/beast-gtk/icons/Makefile.am
  66 --- beast-0.5.1.orig/beast-gtk/icons/Makefile.am        Mon Apr 14 09:12:39 2003
  67 +++ beast-0.5.1/beast-gtk/icons/Makefile.am     Mon Apr 14 09:14:32 2003
  68 @@ -85,7 +85,7 @@
  69  @STRIP_END@
  70
  71  gen_sources = xgen-bsgc xgen-bsgh
  72 -CLEANFILES += $(gen_sources) bst-stock-gen.c bst-stock-gen.h
  73 +CLEANFILES = $(gen_sources) bst-stock-gen.c bst-stock-gen.h
  74  noinst_DATA = bst-stock-gen.c bst-stock-gen.h
  75  EXTRA_DIST  = $(SRC_IMAGES) $(filter-out STOCK_%, $(STOCK_IMAGE_DEFS))
  76
  77 diff -urN beast-0.5.1.orig/beast-gtk/images/Makefile.am beast-0.5.1/beast-gtk/images/Makefile.am
  78 --- beast-0.5.1.orig/beast-gtk/images/Makefile.am       Mon Apr 14 09:12:39 2003
  79 +++ beast-0.5.1/beast-gtk/images/Makefile.am    Mon Apr 14 09:14:32 2003
  80 @@ -15,10 +15,10 @@
  81
  82  imagesdir = ${beastimagesdir}
  83  images_DATA = ${public_images}
  84 -EXTRA_DIST += ${public_images} ${private_images}
  85 +EXTRA_DIST = ${public_images} ${private_images}
  86
  87  gen_sources           = xgen-bstih
  88 -CLEANFILES           += $(gen_sources) beast-images.h
  89 +CLEANFILES            = $(gen_sources) beast-images.h
  90  noinst_DATA           = beast-images.h
  91
  92  beast-images.h:        Makefile ${public_images}
  93 diff -urN beast-0.5.1.orig/bse/Makefile.am beast-0.5.1/bse/Makefile.am
  94 --- beast-0.5.1.orig/bse/Makefile.am    Mon Apr 14 09:12:39 2003
  95 +++ beast-0.5.1/bse/Makefile.am Mon Apr 14 09:14:32 2003
  96 @@ -179,9 +179,9 @@
  97  bse_h_sources = $(bse_private_h_sources) $(bse_public_h_sources) $(bse_built_h_sources)
  98  libbseinclude_HEADERS = $(bse_public_h_sources) $(bse_built_h_sources)
  99  libbse_la_SOURCES = $(bse_c_sources) $(bse_builtin_c_sources)
 100 -MAINTAINERCLEANFILES += $(bse_built_h_sources) $(bse_built_c_sources)
 101 -EXTRA_HEADERS +=
 102 -EXTRA_DIST += $(bse_private_h_sources) $(bse_proc_sources)
 103 +MAINTAINERCLEANFILES = $(bse_built_h_sources) $(bse_built_c_sources)
 104 +EXTRA_HEADERS =
 105 +EXTRA_DIST = $(bse_private_h_sources) $(bse_proc_sources)
 106  EXTRA_DIST += $(bse_built_c_sources) $(bse_built_h_sources) $(bse_extra_sources)
 107  GLIB_MKENUMS = glib-mkenums
 108  SFIDL = ../sfi/sfidl   # WATCH OUT: $(SFIDL) works only for srcdir==builddir with cd $(srcdir)
 109 @@ -193,7 +193,7 @@
 110  # setup autogeneration dependancies
 111  tmp_files = xgen-sbgth xgen-bgtc xgen-bgtac xgen-sbeac xgen-belc xgen-bbec xgen-bbac \
 112             xgen-bnac xgen-bmx xgen-bmh xgen-bmc xgen-bgasi
 113 -CLEANFILES += $(tmp_files) @DVLBUILD@ $(bse_proc_gen_sources)
 114 +CLEANFILES = $(tmp_files) @DVLBUILD@ $(bse_proc_gen_sources)
 115  $(OBJECTS): $(bse_built_h_sources)
 116  # piggyback generation through sideeffects, needs NOP-rule for dep-tracking, must be in srcdir
 117  $(srcdir)/bsegentypes.h: @DVLBUILD@ stamp-bsegentypes.h ;
 118 diff -urN beast-0.5.1.orig/bse/icons/Makefile.am beast-0.5.1/bse/icons/Makefile.am
 119 --- beast-0.5.1.orig/bse/icons/Makefile.am      Mon Apr 14 09:12:39 2003
 120 +++ beast-0.5.1/bse/icons/Makefile.am   Mon Apr 14 09:14:32 2003
 121 @@ -15,7 +15,7 @@
 122         done \
 123         && echo "## Generated data ends here" >> $@
 124
 125 -EXTRA_DIST += $(strip \
 126 +EXTRA_DIST = $(strip \
 127         $(icon_list) \
 128  )
 129
 130 diff -urN beast-0.5.1.orig/configure.in beast-0.5.1/configure.in
 131 --- beast-0.5.1.orig/configure.in       Mon Apr 14 09:12:39 2003
 132 +++ beast-0.5.1/configure.in    Mon Apr 14 09:18:34 2003
 133 @@ -13,13 +13,13 @@
 134  #
 135  # BSE version numbers
 136  #
 137 -AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
 138 +#AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
 139  BSE_MAJOR_VERSION=0
 140  BSE_MINOR_VERSION=5
 141  BSE_MICRO_VERSION=1
 142  BSE_INTERFACE_AGE=0
 143  BSE_BINARY_AGE=0
 144 -AC_DIVERT_POP()dnl
 145 +#AC_DIVERT_POP()dnl
 146  dnl#
 147  dnl# Making releases:
 148  dnl#   BSE_MICRO_VERSION += 1;
 149 @@ -57,13 +57,13 @@
 150
 151  dnl figure debugging default, prior to $ac_help setup
 152  dnl
 153 -AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
 154 +#AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
 155  if test `expr $BSE_MINOR_VERSION \% 2 \| $BSE_MAJOR_VERSION \< 1` = 1 ; then
 156          debug_default=yes
 157  else
 158          debug_default=minimum
 159  fi
 160 -AC_DIVERT_POP()dnl
 161 +#AC_DIVERT_POP()dnl
 162
 163
 164  # initialize automake, don't define PACKAGE and VERSION