[niepce] build: remove Magellan for good



commit e9b7aa4d8ce604566a79ded11dda43883d430122
Author: Hubert Figuière <hub figuiere net>
Date:   Sun Oct 23 20:42:45 2016 -0400

    build: remove Magellan for good
    
    now that there is GPS ami

 .gitignore                     |    3 -
 Makefile.am                    |    7 +-
 configure.ac                   |   45 +--------
 magellan/Makefile.am           |    3 -
 magellan/README                |   38 -------
 magellan/src/Makefile.am       |   25 -----
 magellan/src/main.cpp          |   44 --------
 magellan/src/mgapplication.cpp |   54 ----------
 magellan/src/mgapplication.hpp |   46 --------
 magellan/src/mgwindow.cpp      |  147 --------------------------
 magellan/src/mgwindow.hpp      |   59 ----------
 magellan/src/mgwindow.ui       |  228 ----------------------------------------
 po/POTFILES.in                 |    2 -
 13 files changed, 3 insertions(+), 698 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 40144a5..dbb1ba0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -65,9 +65,6 @@ src/niepce/niepce
 camerawire/src/camerawire
 camerawire/po/POTFILES
 camerawire/po/Makefile.in
-magellan/src/magellan
-magellan/po/POTFILES
-magellan/po/Makefile.in
 doc/Doxyfile
 doc/doxygen/html
 po/*.gmo
diff --git a/Makefile.am b/Makefile.am
index e9caa2d..6f8c96b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,9 +14,6 @@ DISTCLEANFILES = intltool-extract \
 if CW_BUILD
 CW_DIR = camerawire
 endif
-if MG_BUILD
-MG_DIR = magellan
-endif
 
-SUBDIRS = po data src $(CW_DIR) $(MG_DIR)
-DIST_SUBDIRS = po art data doc src camerawire magellan
+SUBDIRS = po data src $(CW_DIR)
+DIST_SUBDIRS = po art data doc src camerawire
diff --git a/configure.ac b/configure.ac
index 0762c71..268cb24 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,20 +61,10 @@ AC_ARG_ENABLE(camerawire,[  --enable-camerawire   Enable building Camerawire],[
 ],[
     NP_APP_CAMERAWIRE=no
 ])
-AC_ARG_ENABLE(magellan,[  --enable-magellan   Enable building Magellan],[
-    NP_APP_MAGELLAN=yes
-    if test ! -z "$NP_APPS" ; then
-        NP_APPS="$NP_APPS,"
-    fi
-    NP_APPS="$NP_APPSmagellan"
-],[
-    NP_APP_MAGELLAN=no
-])
 AC_ARG_ENABLE(allapps, [  --enable-allapps   Enable all apps],[
     NP_APP_NIEPCE=yes
     NP_APP_CAMERAWIRE=yes
-    NP_APP_MAGELLAN=yes
-    NP_APPS="niepce,camerawire,magellan"
+    NP_APPS="niepce,camerawire"
 ],[
 
 ])
@@ -247,39 +237,6 @@ camerawire/po/Makefile
 
 fi
 
-dnl ================
-dnl magellan
-dnl ================
-
-AM_CONDITIONAL(MG_BUILD, test "$NP_APP_MAGELLAN" = "yes")
-if test "$NP_APP_MAGELLAN" = "yes" ; then
-MAJOR_VERSION=0
-MINOR_VERSION=0
-MICRO_VERSION=1
-
-MG_VERSION="$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION"
-AC_SUBST(MG_VERSION)
-
-MG_GETTEXT_PACKAGE=magellan
-AC_SUBST(MG_GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED([MG_GETTEXT_PACKAGE], ["$MG_GETTEXT_PACKAGE"],
-                   [The domain to use with gettext])
-AM_GLIB_GNU_GETTEXT
-
-MG_LOCALEDIR=[${datadir}/locale]
-AC_SUBST(MG_LOCALEDIR)
-
-AC_DEFINE_UNQUOTED([MG_BUILD_CONFIG], ["$MG_BUILD_CONFIG"], [The string used to hardcode the build config.])
-
-AC_CONFIG_FILES([
-magellan/Makefile
-magellan/src/Makefile
-magellan/po/Makefile.in
-magellan/po/Makefile
-])
-
-fi
-
 AC_OUTPUT
 
 echo "
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6b697de..88832ec 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,8 +2,6 @@
 camerawire/src/cwwindow.cpp
 data/niepce.appdata.xml.in
 data/niepce.desktop.in.in
-magellan/src/mgwindow.cpp
-[type: gettext/glade]magellan/src/mgwindow.ui
 src/engine/db/library.cpp
 src/engine/importer/directoryimporter.cpp
 src/fwk/toolkit/application.cpp


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]