celestia-as-needed.patch

   1 diff -dur celestia-1.6.1.orig/src/celestia/Makefile.am celestia-1.6.1/src/celestia/Makefile.am
   2 --- celestia-1.6.1.orig/src/celestia/Makefile.am        2011-06-05 18:11:13.000000000 +0200
   3 +++ celestia-1.6.1/src/celestia/Makefile.am     2015-07-10 18:49:02.940315395 +0200
   4 @@ -7,14 +7,14 @@
   5
   6  if ENABLE_KDE
   7  SUBDIRS += kde
   8 -celestiaKDELIBS = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) \
   9 -                  $(LIBSOCKET) -lDCOP kde/libkdegui.a
  10 +celestiaKDELIBS = kde/libkdegui.a $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) \
  11 +                 $(LIB_KFILE) $(LIBSOCKET) -lDCOP
  12  celestia_LDFLAGS = $(all_libraries) $(KDE_RPATH)
  13  endif
  14
  15  if ENABLE_GTK
  16  SUBDIRS += gtk
  17 -celestiaGTKLIBS = $(GTK_LIBS) gtk/libgtkgui.a
  18 +celestiaGTKLIBS = gtk/libgtkgui.a $(GTK_LIBS)
  19  endif
  20
  21  COMMONSOURCES = \
  22 @@ -88,7 +88,8 @@
  23         ../cel3ds/libcel3ds.a \
  24         ../celmath/libcelmath.a \
  25         ../celutil/libcelutil.a \
  26 -       $(SPICE_LIBS)
  27 +       $(SPICE_LIBS) \
  28 +       $(GL_LIBS)
  29
  30  noinst_HEADERS = $(wildcard *.h)
  31  noinst_DATA = ../../celestia
  32 diff -dur celestia-1.6.1.orig/src/celestia/Makefile.in celestia-1.6.1/src/celestia/Makefile.in
  33 --- celestia-1.6.1.orig/src/celestia/Makefile.in        2011-06-05 20:34:28.000000000 +0200
  34 +++ celestia-1.6.1/src/celestia/Makefile.in     2015-07-10 18:49:02.940315395 +0200
  35 @@ -473,11 +473,11 @@
  36  xdg_menudir = @xdg_menudir@
  37  SUBDIRS = res $(am__append_1) $(am__append_2)
  38  INCLUDES = -I..
  39 -@ENABLE_KDE_TRUE@celestiaKDELIBS = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) \
  40 -@ENABLE_KDE_TRUE@                  $(LIBSOCKET) -lDCOP kde/libkdegui.a
  41 +@ENABLE_KDE_TRUE@celestiaKDELIBS = kde/libkdegui.a $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) \
  42 +@ENABLE_KDE_TRUE@                  $(LIB_KFILE) $(LIBSOCKET) -lDCOP
  43
  44  @ENABLE_KDE_TRUE@celestia_LDFLAGS = $(all_libraries) $(KDE_RPATH)
  45 -@ENABLE_GTK_TRUE@celestiaGTKLIBS = $(GTK_LIBS) gtk/libgtkgui.a
  46 +@ENABLE_GTK_TRUE@celestiaGTKLIBS = gtk/libgtkgui.a $(GTK_LIBS)
  47  COMMONSOURCES = \
  48         celestiacore.cpp \
  49         configfile.cpp \
  50 @@ -538,7 +538,8 @@
  51         ../cel3ds/libcel3ds.a \
  52         ../celmath/libcelmath.a \
  53         ../celutil/libcelutil.a \
  54 -       $(SPICE_LIBS)
  55 +       $(SPICE_LIBS) \
  56 +       $(GL_LIBS)
  57
  58  noinst_HEADERS = $(wildcard *.h)
  59  noinst_DATA = ../../celestia