SimGear-am_fix.patch

   1 diff -urN SimGear-0.0.18.orig/simgear/bucket/Makefile.am SimGear-0.0.18/simgear/bucket/Makefile.am
   2 --- SimGear-0.0.18.orig/simgear/bucket/Makefile.am      Thu May  2 21:43:43 2002
   3 +++ SimGear-0.0.18/simgear/bucket/Makefile.am   Thu May  2 21:44:43 2002
   4 @@ -14,8 +14,5 @@
   5  #      $(top_builddir)/bucket/libsgbucket.a \
   6  #      $(top_builddir)/misc/libsgmisc.a
   7
   8 -if OLD_AUTOMAKE
   9 -INCLUDES += -I$(top_srcdir)
  10 -else
  11  INCLUDES = -I$(top_srcdir)
  12 -endif
  13 +
  14 diff -urN SimGear-0.0.18.orig/simgear/debug/Makefile.am SimGear-0.0.18/simgear/debug/Makefile.am
  15 --- SimGear-0.0.18.orig/simgear/debug/Makefile.am       Thu May  2 21:43:43 2002
  16 +++ SimGear-0.0.18/simgear/debug/Makefile.am    Thu May  2 21:44:57 2002
  17 @@ -8,8 +8,5 @@
  18
  19  libsgdebug_a_SOURCES = logstream.cxx
  20
  21 -if OLD_AUTOMAKE
  22 -INCLUDES += -I$(top_srcdir)
  23 -else
  24  INCLUDES = -I$(top_srcdir)
  25 -endif
  26 +
  27 diff -urN SimGear-0.0.18.orig/simgear/ephemeris/Makefile.am SimGear-0.0.18/simgear/ephemeris/Makefile.am
  28 --- SimGear-0.0.18.orig/simgear/ephemeris/Makefile.am   Thu May  2 21:43:43 2002
  29 +++ SimGear-0.0.18/simgear/ephemeris/Makefile.am        Thu May  2 21:45:13 2002
  30 @@ -31,8 +31,5 @@
  31         uranus.cxx \
  32         venus.cxx
  33
  34 -if OLD_AUTOMAKE
  35 -INCLUDES += -I$(top_srcdir)
  36 -else
  37  INCLUDES = -I$(top_srcdir)
  38 -endif
  39 +
  40 diff -urN SimGear-0.0.18.orig/simgear/io/Makefile.am SimGear-0.0.18/simgear/io/Makefile.am
  41 --- SimGear-0.0.18.orig/simgear/io/Makefile.am  Thu May  2 21:43:43 2002
  42 +++ SimGear-0.0.18/simgear/io/Makefile.am       Thu May  2 21:46:25 2002
  43 @@ -20,11 +20,7 @@
  44         sg_socket.cxx \
  45         sg_socket_udp.cxx
  46
  47 -if OLD_AUTOMAKE
  48 -INCLUDES += -I$(top_srcdir)
  49 -else
  50  INCLUDES = -I$(top_srcdir)
  51 -endif
  52
  53  if IS_MINGW
  54  NETWORK_LIB = -lwsock32
  55 diff -urN SimGear-0.0.18.orig/simgear/magvar/Makefile.am SimGear-0.0.18/simgear/magvar/Makefile.am
  56 --- SimGear-0.0.18.orig/simgear/magvar/Makefile.am      Thu May  2 21:43:43 2002
  57 +++ SimGear-0.0.18/simgear/magvar/Makefile.am   Thu May  2 21:46:41 2002
  58 @@ -14,8 +14,5 @@
  59
  60  testmagvar_LDADD = $(top_builddir)/simgear/magvar/libsgmagvar.a
  61
  62 -if OLD_AUTOMAKE
  63 -INCLUDES += -I$(top_srcdir)
  64 -else
  65  INCLUDES = -I$(top_srcdir)
  66 -endif
  67 +
  68 diff -urN SimGear-0.0.18.orig/simgear/math/Makefile.am SimGear-0.0.18/simgear/math/Makefile.am
  69 --- SimGear-0.0.18.orig/simgear/math/Makefile.am        Thu May  2 21:43:43 2002
  70 +++ SimGear-0.0.18/simgear/math/Makefile.am     Thu May  2 21:46:55 2002
  71 @@ -24,8 +24,5 @@
  72         sg_random.c \
  73         vector.cxx
  74
  75 -if OLD_AUTOMAKE
  76 -INCLUDES += -I$(top_srcdir)
  77 -else
  78  INCLUDES = -I$(top_srcdir)
  79 -endif
  80 +
  81 diff -urN SimGear-0.0.18.orig/simgear/metar/Makefile.am SimGear-0.0.18/simgear/metar/Makefile.am
  82 --- SimGear-0.0.18.orig/simgear/metar/Makefile.am       Thu May  2 21:43:43 2002
  83 +++ SimGear-0.0.18/simgear/metar/Makefile.am    Thu May  2 21:47:11 2002
  84 @@ -11,8 +11,5 @@
  85         MetarStation.cpp \
  86         Prtdmetr.cpp Stspack2.cpp Stspack3.cpp
  87
  88 -if OLD_AUTOMAKE
  89 -INCLUDES += -I$(top_srcdir)
  90 -else
  91  INCLUDES = -I$(top_srcdir)
  92 -endif
  93 +
  94 diff -urN SimGear-0.0.18.orig/simgear/misc/Makefile.am SimGear-0.0.18/simgear/misc/Makefile.am
  95 --- SimGear-0.0.18.orig/simgear/misc/Makefile.am        Thu May  2 21:43:43 2002
  96 +++ SimGear-0.0.18/simgear/misc/Makefile.am     Thu May  2 21:47:28 2002
  97 @@ -30,8 +30,5 @@
  98  props_test_SOURCES = props_test.cxx
  99  props_test_LDADD = libsgmisc.a ../xml/libsgxml.a ../debug/libsgdebug.a
 100
 101 -if OLD_AUTOMAKE
 102 -INCLUDES += -I$(top_srcdir)
 103 -else
 104  INCLUDES = -I$(top_srcdir)
 105 -endif
 106 +
 107 diff -urN SimGear-0.0.18.orig/simgear/route/Makefile.am SimGear-0.0.18/simgear/route/Makefile.am
 108 --- SimGear-0.0.18.orig/simgear/route/Makefile.am       Thu May  2 21:43:43 2002
 109 +++ SimGear-0.0.18/simgear/route/Makefile.am    Thu May  2 21:47:43 2002
 110 @@ -8,11 +8,7 @@
 111         route.cxx \
 112         waypoint.cxx
 113
 114 -if OLD_AUTOMAKE
 115 -INCLUDES += -I$(top_srcdir)
 116 -else
 117  INCLUDES = -I$(top_srcdir)
 118 -endif
 119
 120  noinst_PROGRAMS = waytest routetest
 121
 122 diff -urN SimGear-0.0.18.orig/simgear/screen/Makefile.am SimGear-0.0.18/simgear/screen/Makefile.am
 123 --- SimGear-0.0.18.orig/simgear/screen/Makefile.am      Thu May  2 21:43:43 2002
 124 +++ SimGear-0.0.18/simgear/screen/Makefile.am   Thu May  2 21:48:01 2002
 125 @@ -19,8 +19,5 @@
 126          tr.cxx \
 127         win32-printer.h
 128
 129 -if OLD_AUTOMAKE
 130 -INCLUDES += -I$(top_srcdir)
 131 -else
 132  INCLUDES = -I$(top_srcdir)
 133 -endif
 134 +
 135 diff -urN SimGear-0.0.18.orig/simgear/serial/Makefile.am SimGear-0.0.18/simgear/serial/Makefile.am
 136 --- SimGear-0.0.18.orig/simgear/serial/Makefile.am      Thu May  2 21:43:43 2002
 137 +++ SimGear-0.0.18/simgear/serial/Makefile.am   Thu May  2 21:48:50 2002
 138 @@ -14,8 +14,5 @@
 139         $(top_builddir)/simgear/serial/libsgserial.a \
 140         $(top_builddir)/simgear/debug/libsgdebug.a
 141
 142 -if OLD_AUTOMAKE
 143 -INCLUDES += -I$(top_srcdir)
 144 -else
 145  INCLUDES = -I$(top_srcdir)
 146 -endif
 147 +
 148 diff -urN SimGear-0.0.18.orig/simgear/sky/Makefile.am SimGear-0.0.18/simgear/sky/Makefile.am
 149 --- SimGear-0.0.18.orig/simgear/sky/Makefile.am Thu May  2 21:43:43 2002
 150 +++ SimGear-0.0.18/simgear/sky/Makefile.am      Thu May  2 21:49:32 2002
 151 @@ -20,8 +20,5 @@
 152         sphere.cxx \
 153         stars.cxx
 154
 155 -if OLD_AUTOMAKE
 156 -INCLUDES += -I$(top_srcdir)
 157 -else
 158  INCLUDES = -I$(top_srcdir)
 159 -endif
 160 +
 161 diff -urN SimGear-0.0.18.orig/simgear/threads/Makefile.am SimGear-0.0.18/simgear/threads/Makefile.am
 162 --- SimGear-0.0.18.orig/simgear/threads/Makefile.am     Thu May  2 21:43:43 2002
 163 +++ SimGear-0.0.18/simgear/threads/Makefile.am  Thu May  2 21:49:51 2002
 164 @@ -10,8 +10,5 @@
 165  libsgthreads_a_SOURCES = \
 166         SGThread.cxx
 167
 168 -if OLD_AUTOMAKE
 169 -INCLUDES += -I$(top_srcdir)
 170 -else
 171  INCLUDES = -I$(top_srcdir)
 172 -endif
 173 +
 174 diff -urN SimGear-0.0.18.orig/simgear/timing/Makefile.am SimGear-0.0.18/simgear/timing/Makefile.am
 175 --- SimGear-0.0.18.orig/simgear/timing/Makefile.am      Thu May  2 21:43:43 2002
 176 +++ SimGear-0.0.18/simgear/timing/Makefile.am   Thu May  2 21:50:05 2002
 177 @@ -16,8 +16,5 @@
 178         timestamp.cxx \
 179         timezone.cxx
 180
 181 -if OLD_AUTOMAKE
 182 -INCLUDES += -I$(top_srcdir)
 183 -else
 184  INCLUDES = -I$(top_srcdir)
 185 -endif
 186 +
 187 diff -urN SimGear-0.0.18.orig/simgear/xgl/Makefile.am SimGear-0.0.18/simgear/xgl/Makefile.am
 188 --- SimGear-0.0.18.orig/simgear/xgl/Makefile.am Thu May  2 21:43:43 2002
 189 +++ SimGear-0.0.18/simgear/xgl/Makefile.am      Thu May  2 21:50:18 2002
 190 @@ -6,8 +6,5 @@
 191
 192  libsgxgl_a_SOURCES = xgl.c xglUtils.c
 193
 194 -if OLD_AUTOMAKE
 195 -INCLUDES += -I$(top_srcdir)
 196 -else
 197  INCLUDES = -I$(top_srcdir)
 198 -endif
 199 +
 200 diff -urN SimGear-0.0.18.orig/simgear/xml/Makefile.am SimGear-0.0.18/simgear/xml/Makefile.am
 201 --- SimGear-0.0.18.orig/simgear/xml/Makefile.am Thu May  2 21:43:43 2002
 202 +++ SimGear-0.0.18/simgear/xml/Makefile.am      Thu May  2 21:50:31 2002
 203 @@ -18,8 +18,5 @@
 204         xmltok.h xmltok.c \
 205         xmltok_impl.h
 206
 207 -if OLD_AUTOMAKE
 208 -INCLUDES += -I$(top_srcdir)
 209 -else
 210  INCLUDES = -I$(top_srcdir)
 211 -endif
 212 +
 213
 214 --- hand/Makefile.am~   Wed Apr  3 23:18:54 2002
 215 +++ edited/Makefile.am  Fri May  3 12:42:22 2002
 216 @@ -7,7 +7,7 @@
 217         SimGear.dsp \
 218         SimGear.dsw
 219
 220 -SUBDIRS        = src-libs simgear
 221 +SUBDIRS        = simgear
 222
 223  #
 224  # Rule to build RPM distribution package
 225
 226