org.handhelds.familiar/packages/gtk+/gtk+-2.2.4/automake-lossage.patch

   1 --- gtk/Makefile.am.old 2003-09-03 20:50:06.000000000 +0100
   2 +++ gtk/Makefile.am     2004-03-07 12:17:29.000000000 +0000
   3 @@ -2,7 +2,7 @@
   4
   5  SUBDIRS=stock-icons theme-bits
   6
   7 -INCLUDES = @STRIP_BEGIN@ \
   8 +INCLUDES =  \
   9         -DG_LOG_DOMAIN=\"Gtk\"                          \
  10         -DGTK_LIBDIR=\"$(libdir)\"                      \
  11         -DGTK_DATA_PREFIX=\"$(prefix)\"                 \
  12 @@ -20,8 +20,7 @@
  13         -DGDK_DISABLE_DEPRECATED                        \
  14         -DGTK_DISABLE_DEPRECATED                        \
  15         @GTK_DEBUG_FLAGS@                               \
  16 -       @GTK_DEP_CFLAGS@                                \
  17 -@STRIP_END@
  18 +       @GTK_DEP_CFLAGS@
  19
  20  gtarget=@gdktarget@
  21
  22 @@ -67,7 +66,7 @@
  23  # since automake doesn't support conditionalized libsomething_la_LDFLAGS
  24  # we use the general approach here
  25  libgtkincludedir = $(includedir)/gtk-2.0/gtk
  26 -LDFLAGS = @STRIP_BEGIN@ \
  27 +AM_LDFLAGS =  \
  28         @LDFLAGS@                                                               \
  29         -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)                    \
  30         -export-dynamic                                                         \
  31 @@ -77,8 +76,8 @@
  32         $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la          \
  33         $(top_builddir)/gdk/@gdktargetlib@                                      \
  34         $(libgtk_target_ldflags)                                                \
  35 -       @GTK_DEP_LIBS@                                                          \
  36 -@STRIP_END@
  37 +       @GTK_DEP_LIBS@
  38 +
  39
  40  #
  41  # setup source file variables
  42 @@ -86,7 +85,7 @@
  43
  44  # GTK+ header files for public installation (non-generated, or generated
  45  # by configure)
  46 -gtk_public_h_sources = @STRIP_BEGIN@ \
  47 +gtk_public_h_sources =  \
  48         gtk.h                   \
  49         gtkaccelgroup.h         \
  50         gtkaccellabel.h         \
  51 @@ -228,10 +227,10 @@
  52         gtkvscrollbar.h         \
  53         gtkvseparator.h         \
  54         gtkwidget.h             \
  55 -       gtkwindow.h             \
  56 -@STRIP_END@
  57 +       gtkwindow.h
  58 +
  59  # GTK+ header files that don't get installed
  60 -gtk_private_h_sources = @STRIP_BEGIN@ \
  61 +gtk_private_h_sources =  \
  62         gtkrbtree.h             \
  63         gtktextbtree.h          \
  64         gtktextchildprivate.h   \
  65 @@ -244,8 +243,7 @@
  66         gtkthemes.h             \
  67         gtktreedatalist.h       \
  68         gtktreeprivate.h        \
  69 -       gtkwindow-decorate.h    \
  70 -@STRIP_END@
  71 +       gtkwindow-decorate.h
  72
  73  # GTK+ C sources to build the library from
  74
  75 @@ -257,7 +255,7 @@
  76         gtktreeitem.c
  77  endif
  78
  79 -gtk_c_sources = @STRIP_BEGIN@   \
  80 +gtk_c_sources =                        \
  81         gtkaccelgroup.c         \
  82         gtkaccelmap.c           \
  83         gtkaccellabel.c         \
  84 @@ -410,15 +408,13 @@
  85         gtkwindow-decorate.c    \
  86         fnmatch.c               \
  87         xembed.h                \
  88 -       ${crufty_gtk_c_sources} \
  89 -@STRIP_END@
  90 +       ${crufty_gtk_c_sources}
  91
  92 -gtk_plug_c_sources = @STRIP_BEGIN@   \
  93 +gtk_plug_c_sources =           \
  94         gtkplug.c               \
  95         gtksocket.c             \
  96         gtkxembed.c             \
  97 -       gtkxembed.h             \
  98 -@STRIP_END@
  99 +       gtkxembed.h
 100
 101  # we use our own built_sources variable rules to avoid automake's
 102  # BUILT_SOURCES oddities
 103 @@ -427,35 +423,34 @@
 104  # content
 105
 106  # built sources that get installed with the header files
 107 -gtk_built_public_sources = @STRIP_BEGIN@ \
 108 +gtk_built_public_sources =  \
 109         gtkmarshal.h            \
 110 -       gtktypebuiltins.h       \
 111 -@STRIP_END@
 112 -gtk_built_private_headers = @STRIP_BEGIN@ \
 113 -       gtkmarshalers.h         \
 114 -@STRIP_END@
 115 +       gtktypebuiltins.h
 116 +
 117 +gtk_built_private_headers =  \
 118 +       gtkmarshalers.h
 119 +
 120  # built sources that don't get installed
 121 -gtk_built_sources = @STRIP_BEGIN@              \
 122 +gtk_built_sources =            \
 123         gtktypebuiltins.c                       \
 124         gtkmarshalers.c                         \
 125         gtkmarshalers.h                         \
 126         gtkmarshal.c                            \
 127         ${gtk_built_private_headers}            \
 128 -       ${gtk_built_public_sources}             \
 129 -@STRIP_END@
 130 -stamp_files = @STRIP_BEGIN@            \
 131 +       ${gtk_built_public_sources}
 132 +
 133 +stamp_files =                  \
 134         stamp-gtkmarshalers.h           \
 135         stamp-gtkmarshal.h              \
 136 -       stamp-gtktypebuiltins.h         \
 137 -@STRIP_END@
 138 +       stamp-gtktypebuiltins.h
 139 +
 140  # non-header sources (headers should be specified in the above variables)
 141  # that don't serve as direct make target sources, i.e. they don't have
 142  # their own .lo rules and don't get publically installed
 143 -gtk_extra_sources = @STRIP_BEGIN@ \
 144 +gtk_extra_sources =  \
 145         gtkversion.h.in         \
 146         gtkmarshalers.list      \
 147 -       gtkmarshal.list         \
 148 -@STRIP_END@
 149 +       gtkmarshal.list
 150
 151  #
 152  # setup GTK+ sources and their dependencies
 153 @@ -592,11 +587,10 @@
 154
 155  TEST_DEPS = $(DEPS) gtk.immodules
 156
 157 -LDADDS = @STRIP_BEGIN@ \
 158 +LDADDS =  \
 159         $(gtktargetlib)                                                 \
 160         $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la  \
 161 -       $(top_builddir)/gdk/$(gdktargetlib)                             \
 162 -@STRIP_END@
 163 +       $(top_builddir)/gdk/$(gdktargetlib)
 164
 165  #
 166  # Installed tools
 167 @@ -615,7 +609,7 @@
 168           echo $$p; \
 169         done
 170
 171 -EXTRA_DIST += @STRIP_BEGIN@    \
 172 +EXTRA_DIST +=          \
 173         line-arrow.xbm          \
 174         line-wrap.xbm           \
 175         tree_plus.xbm           \
 176 @@ -629,9 +623,8 @@
 177         gtkrc.key.default       \
 178         gtkrc.key.emacs         \
 179         makefile.msc            \
 180 -       makefile.msc.in         \
 181 -@STRIP_END@
 182 +       makefile.msc.in
 183
 184  install-data-local:
 185
 186
 187 --- gdk/Makefile.am.old 2003-09-03 20:49:25.000000000 +0100
 188 +++ gdk/Makefile.am     2004-03-07 12:18:18.000000000 +0000
 189 @@ -10,7 +10,7 @@
 190         makeenums.pl            \
 191         makefile.msc
 192
 193 -common_includes = @STRIP_BEGIN@        \
 194 +common_includes =      \
 195         -DG_LOG_DOMAIN=\"Gdk\"          \
 196         -DGDK_COMPILATION               \
 197         -I$(top_srcdir)                 \
 198 @@ -20,8 +20,7 @@
 199         -DGDK_PIXBUF_DISABLE_DEPRECATED \
 200         -DGDK_DISABLE_DEPRECATED        \
 201         @GTK_DEBUG_FLAGS@               \
 202 -       @GDK_DEP_CFLAGS@                \
 203 -@STRIP_END@
 204 +       @GDK_DEP_CFLAGS@
 205
 206  INCLUDES = $(common_includes)
 207  gtarget=@gdktarget@
 208 @@ -69,7 +68,7 @@
 209  # libtool stuff: set version and export symbols for resolving
 210  # since automake doesn't support conditionalized libsomething_la_LDFLAGS
 211  # we use the general approach here
 212 -LDFLAGS = @STRIP_BEGIN@                                                \
 213 +AM_LDFLAGS =                                           \
 214         @LDFLAGS@                                                       \
 215         -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)            \
 216         -export-dynamic                                                 \
 217 @@ -77,8 +76,7 @@
 218         $(no_undefined)                                                 \
 219         @LIBTOOL_EXPORT_OPTIONS@                                        \
 220         $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la  \
 221 -       $(gdk_win32_symbols)                                            \
 222 -@STRIP_END@
 223 +       $(gdk_win32_symbols)
 224
 225  #
 226  # setup source file variables
 227 @@ -88,7 +86,7 @@
 228  #
 229  # Note: files added here may need to be be propagated to gdk_headers in gtk/Makefile.am
 230  #
 231 -gdk_public_h_sources = @STRIP_BEGIN@           \
 232 +gdk_public_h_sources =                 \
 233         gdk.h                                   \
 234         gdkcolor.h                              \
 235         gdkcursor.h                             \
 236 @@ -114,16 +112,14 @@
 237         gdkselection.h                          \
 238         gdktypes.h                              \
 239         gdkvisual.h                             \
 240 -       gdkwindow.h                             \
 241 -@STRIP_END@
 242 +       gdkwindow.h
 243
 244 -gdk_headers = @STRIP_BEGIN@       \
 245 +gdk_headers =        \
 246         $(gdk_public_h_sources)   \
 247         gdkenumtypes.h            \
 248 -       gdkprivate.h              \
 249 -@STRIP_END@
 250 +       gdkprivate.h
 251
 252 -gdk_c_sources = @STRIP_BEGIN@  \
 253 +gdk_c_sources =        \
 254         gdk.c                   \
 255         gdkcolor.c              \
 256         gdkcursor.c             \
 257 @@ -153,8 +149,7 @@
 258         gdkscreen.c             \
 259         gdkselection.c          \
 260         gdkvisual.c             \
 261 -       gdkwindow.c             \
 262 -@STRIP_END@
 263 +       gdkwindow.c
 264
 265  #
 266  # setup GDK sources and their dependencies
 267 @@ -164,11 +159,10 @@
 268  gdkinclude_HEADERS = $(gdk_headers)
 269
 270  # gdkmarshalers.c is not here becuase it is currently an empty file
 271 -common_sources = @STRIP_BEGIN@ \
 272 +common_sources =       \
 273         $(gdk_c_sources)        \
 274         gdkenumtypes.c          \
 275 -       gdkmarshalers.h         \
 276 -@STRIP_END@
 277 +       gdkmarshalers.h
 278
 279  libgdk_x11_2_0_la_SOURCES = $(common_sources)
 280  libgdk_linux_fb_2_0_la_SOURCES = $(common_sources) gdkkeynames.c
 281 --- gdk-pixbuf/Makefile.am.old  2003-01-27 23:19:07.000000000 +0000
 282 +++ gdk-pixbuf/Makefile.am      2004-03-07 12:19:11.000000000 +0000
 283 @@ -238,7 +238,7 @@
 284  endif
 285
 286  DEPS = libgdk_pixbuf-$(GTK_API_VERSION).la
 287 -INCLUDES = @STRIP_BEGIN@                       \
 288 +INCLUDES =                     \
 289         -DG_LOG_DOMAIN=\"GdkPixbuf\"            \
 290         -I$(top_srcdir) -I$(top_builddir)       \
 291         -I$(top_srcdir)/gdk-pixbuf              \
 292 @@ -252,8 +252,7 @@
 293         @INCLUDED_LOADER_DEFINE@                \
 294         @GTK_DEBUG_FLAGS@                       \
 295         @GDK_PIXBUF_DEP_CFLAGS@                 \
 296 -       -DGDK_PIXBUF_ENABLE_BACKEND             \
 297 -@STRIP_END@
 298 +       -DGDK_PIXBUF_ENABLE_BACKEND
 299
 300  AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\""
 301  LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la
 302 @@ -281,7 +280,7 @@
 303  # The GdkPixBuf library
 304  #
 305  libgdk_pixbufincludedir = $(includedir)/gtk-2.0/gdk-pixbuf
 306 -libgdk_pixbuf_2_0_la_SOURCES = @STRIP_BEGIN@ \
 307 +libgdk_pixbuf_2_0_la_SOURCES =  \
 308         gdk-pixbuf-i18n.h       \
 309         gdk-pixbuf.c            \
 310         gdk-pixbuf-animation.c  \
 311 @@ -291,14 +290,13 @@
 312         gdk-pixbuf-scale.c      \
 313         gdk-pixbuf-util.c       \
 314         gdk-pixdata.c           \
 315 -       $(gdk_pixbuf_built_cfiles) \
 316 -@STRIP_END@
 317 -libgdk_pixbuf_2_0_la_LDFLAGS = @STRIP_BEGIN@ \
 318 +       $(gdk_pixbuf_built_cfiles)
 319 +
 320 +libgdk_pixbuf_2_0_la_LDFLAGS =  \
 321         -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)    \
 322         @LIBTOOL_EXPORT_OPTIONS@                                \
 323         $(no_undefined)                                         \
 324 -       $(gdk_pixbuf_symbols)                                   \
 325 -@STRIP_END@
 326 +       $(gdk_pixbuf_symbols)
 327
 328  libgdk_pixbuf_2_0_la_LIBADD = pixops/libpixops.la $(builtin_objs) $(gdk_pixbuf_win32res_lo) $(GDK_PIXBUF_DEP_LIBS)
 329  libgdk_pixbuf_2_0_la_DEPENDENCIES = pixops/libpixops.la $(builtin_objs) $(gdk_pixbuf_def) $(gdk_pixbuf_win32res_lo)
 330 --- demos/Makefile.am.old       2003-06-06 01:52:59.000000000 +0100
 331 +++ demos/Makefile.am   2004-03-07 12:20:23.000000000 +0000
 332 @@ -2,7 +2,7 @@
 333
 334  SUBDIRS = gtk-demo
 335
 336 -INCLUDES = @STRIP_BEGIN@ \
 337 +INCLUDES =  \
 338         -I$(top_srcdir)                                 \
 339         -I$(top_builddir)/gdk                           \
 340         -DG_DISABLE_DEPRECATED                          \
 341 @@ -10,19 +10,17 @@
 342         -DGDK_DISABLE_DEPRECATED                        \
 343         -DGTK_DISABLE_DEPRECATED                        \
 344         @GTK_DEBUG_FLAGS@                               \
 345 -       @GTK_DEP_CFLAGS@                                \
 346 -@STRIP_END@
 347 +       @GTK_DEP_CFLAGS@
 348
 349  DEPS = \
 350         $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la  \
 351         $(top_builddir)/gdk/@gdktargetlib@                              \
 352         $(top_builddir)/gtk/@gtktargetlib@
 353
 354 -LDADDS = @STRIP_BEGIN@                                                         \
 355 +LDADDS =                                                       \
 356         $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la  \
 357         $(top_builddir)/gdk/@gdktargetlib@                              \
 358 -       $(top_builddir)/gtk/@gtktargetlib@                              \
 359 -@STRIP_END@
 360 +       $(top_builddir)/gtk/@gtktargetlib@
 361
 362  noinst_PROGRAMS =              \
 363         testpixbuf              \
 364 --- docs/faq/Makefile.am.old    2002-03-06 03:59:12.000000000 +0000
 365 +++ docs/faq/Makefile.am        2004-03-07 12:23:40.000000000 +0000
 366 @@ -14,15 +14,6 @@
 367  dist-hook: html
 368         cp -Rp $(srcdir)/html $(distdir)
 369  else
 370 -html:
 371 -       echo "***"
 372 -       echo "*** Warning: FAQ not built"
 373 -       echo "***"
 374 -
 375 -pdf:
 376 -       echo "***"
 377 -       echo "*** Warning: FAQ not built"
 378 -       echo "***"
 379
 380  dist-hook:
 381         echo "***"
 382 --- docs/tutorial/Makefile.am.old       2002-03-06 03:59:12.000000000 +0000
 383 +++ docs/tutorial/Makefile.am   2004-03-07 12:24:42.000000000 +0000
 384 @@ -49,15 +49,6 @@
 385  dist-hook: html
 386         cp -Rp $(srcdir)/html $(distdir)
 387  else
 388 -html:
 389 -       echo "***"
 390 -       echo "*** Warning: Tutorial not built"
 391 -       echo "***"
 392 -
 393 -pdf:
 394 -       echo "***"
 395 -       echo "*** Warning: Tutorial not built"
 396 -       echo "***"
 397
 398  dist-hook:
 399         echo "***"
 400 --- demos/gtk-demo/Makefile.am.old      2003-06-09 22:58:32.000000000 +0100
 401 +++ demos/gtk-demo/Makefile.am  2004-03-07 12:25:47.000000000 +0000
 402 @@ -4,7 +4,7 @@
 403
 404  ## These should be in the order you want them to appear in the
 405  ## demo app, which means alphabetized by demo title, not filename
 406 -demos = @STRIP_BEGIN@  \
 407 +demos =        \
 408         appwindow.c     \
 409         button_box.c    \
 410         changedisplay.c \
 411 @@ -21,10 +21,9 @@
 412         sizegroup.c     \
 413         stock_browser.c \
 414         textview.c      \
 415 -       tree_store.c    \
 416 -@STRIP_END@
 417 +       tree_store.c
 418
 419 -INCLUDES = @STRIP_BEGIN@ \
 420 +INCLUDES =  \
 421         -DDEMOCODEDIR="\"$(democodedir)\""              \
 422         -I$(top_srcdir)                                 \
 423         -I$(top_builddir)/gdk                           \
 424 @@ -33,19 +32,17 @@
 425         -DGDK_DISABLE_DEPRECATED                        \
 426         -DGTK_DISABLE_DEPRECATED                        \
 427         @GTK_DEBUG_FLAGS@                               \
 428 -       @GTK_DEP_CFLAGS@                                \
 429 -@STRIP_END@
 430 +       @GTK_DEP_CFLAGS@
 431
 432  DEPS = \
 433         $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la  \
 434         $(top_builddir)/gdk/@gdktargetlib@                              \
 435         $(top_builddir)/gtk/@gtktargetlib@
 436
 437 -LDADDS = @STRIP_BEGIN@                                                         \
 438 +LDADDS =                                                       \
 439         $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la  \
 440         $(top_builddir)/gdk/@gdktargetlib@                              \
 441 -       $(top_builddir)/gtk/@gtktargetlib@                              \
 442 -@STRIP_END@
 443 +       $(top_builddir)/gtk/@gtktargetlib@
 444
 445  bin_PROGRAMS = gtk-demo
 446