From 8b661ed04d6d7fe5039279fabe2fb8fc96f198e3 Mon Sep 17 00:00:00 2001
From: "Gergely POLONKAI (W00d5t0ck)" <gergely@polonkai.eu>
Date: Fri, 6 Sep 2013 11:34:24 +0200
Subject: [PATCH] Changed source to build with external SWE-GLib

---
 Makefile.am                           |  2 +-
 configure.ac                          | 10 +---------
 docs/reference/astrognome/Makefile.am |  2 +-
 src/Makefile.am                       |  4 ++--
 src/astrognome.c                      |  5 ++---
 5 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 0b8875f..3d9b410 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = swe/src swe-glib/src src po docs/reference/swe-glib docs/reference/astrognome
+SUBDIRS = src po docs/reference/astrognome
 
 EXTRA_DIST = config.rpath m4/ChangeLog
 
diff --git a/configure.ac b/configure.ac
index 69e8505..86249f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,21 +41,13 @@ AC_PATH_PROG([GLIB_MKENUMS], [glib-mkenums])
 PKG_CHECK_MODULES([GLIB], [glib-2.0])
 PKG_CHECK_MODULES([GOBJECT], [gobject-2.0])
 PKG_CHECK_MODULES([GTK], [gtk+-3.0])
+PKG_CHECK_MODULES([SWE_GLIB], [swe-glib])
 AC_CONFIG_MACRO_DIR([m4])
 
-LIBSWE_LIBS='$(top_builddir)/swe/src/libswe-1.75.la'
-AC_SUBST(LIBSWE_LIBS)
-
-LIBSWE_GLIB_LIBS='$(top_builddir)/swe-glib/src/libswe-glib-0.1.la'
-AC_SUBST(LIBSWE_GLIB_LIBS)
-
 AC_CONFIG_FILES([
     Makefile
-    swe/src/Makefile
-    swe-glib/src/Makefile
     src/Makefile
     po/Makefile.in
     docs/reference/astrognome/Makefile
-    docs/reference/swe-glib/Makefile
 ])
 AC_OUTPUT
diff --git a/docs/reference/astrognome/Makefile.am b/docs/reference/astrognome/Makefile.am
index 953eac6..961bad4 100644
--- a/docs/reference/astrognome/Makefile.am
+++ b/docs/reference/astrognome/Makefile.am
@@ -79,7 +79,7 @@ expand_content_files=
 # e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
 GTKDOC_CFLAGS=
-GTKDOC_LIBS=$(LIBSWE_LIBS) $(LIBSWE_GLIB_LIBS)
+GTKDOC_LIBS=
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make
diff --git a/src/Makefile.am b/src/Makefile.am
index e0b280a..81912ce 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
 bin_PROGRAMS = astrognome
 
 astrognome_SOURCES = astrognome.c
-astrognome_LDADD = $(LIBSWE_GLIB_LIBS) $(GTK_LIBS)
+astrognome_LDADD = $(SWE_GLIB_LIBS) $(GTK_LIBS)
 astrognome_LDFLAGS = -rdynamic
-astrognome_CFLAGS = $(CFLAGS) $(GTK_CFLAGS) -Wall
+astrognome_CFLAGS = $(SWE_GLIB_CFLAGS) $(CFLAGS) $(GTK_CFLAGS) -Wall
diff --git a/src/astrognome.c b/src/astrognome.c
index 75bcebf..c24d7f4 100644
--- a/src/astrognome.c
+++ b/src/astrognome.c
@@ -1,9 +1,8 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 
-#include "../swe-glib/src/swe-glib.h"
+#include <swe-glib.h>
 
-#define EPHEDIR "/home/polesz/Projektek/c/astrognome/swe/data"
 #define UI_FILE "/home/polesz/Projektek/c/astrognome/src/astrognome.ui"
 
 GtkBuilder *builder;
@@ -487,7 +486,7 @@ main(int argc, char *argv[])
     GError *err = NULL;
     GtkWidget *window_main;
 
-    gswe_init(EPHEDIR);
+    gswe_init();
     gtk_init(&argc, &argv);
 
     builder = gtk_builder_new();