[niepce] Issue 1 - Remove camerawire
- From: Hubert Figuière <hub src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [niepce] Issue 1 - Remove camerawire
- Date: Fri, 12 Jan 2018 05:21:48 +0000 (UTC)
commit 3fc3950b23ab1106224b87d3714544f473349199
Author: Hubert Figuière <hub figuiere net>
Date: Fri Jan 12 00:19:50 2018 -0500
Issue 1 - Remove camerawire
https://gitlab.gnome.org/GNOME/niepce/issues/1
Makefile.am | 8 ++------
configure.ac | 67 ++----------------------------------------------------------
2 files changed, 4 insertions(+), 71 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index bcbc63c..7156a0e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,10 +4,6 @@ EXTRA_DIST = COPYING AUTHORS README \
Cargo.lock \
$(NULL)
-if CW_BUILD
-CW_DIR = camerawire
-endif
-
-SUBDIRS = data src $(CW_DIR) po
-DIST_SUBDIRS = po art data doc src camerawire
+SUBDIRS = data src po
+DIST_SUBDIRS = po art data doc src
diff --git a/configure.ac b/configure.ac
index 9bb42bb..0d41c6e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,38 +41,8 @@ AC_ARG_ENABLE(debug,[ --enable-debug Turn on debugging],[
])
AM_CONDITIONAL(DEBUG, test x$debug = xtrue)
-NP_APPS=""
-
-AC_ARG_ENABLE(niepce,[ --enable-niepce Enable building Niepce (default)],[
- NP_APP_NIEPCE=yes
- if test ! -z "$NP_APPS" ; then
- NP_APPS="$NP_APPS,"
- fi
- NP_APPS="$NP_APPSniepce"
-],[
- NP_APP_NIEPCE=no
-])
-AC_ARG_ENABLE(camerawire,[ --enable-camerawire Enable building Camerawire],[
- NP_APP_CAMERAWIRE=yes
- if test ! -z "$NP_APPS" ; then
- NP_APPS="$NP_APPS,"
- fi
- NP_APPS="$NP_APPScamerawire"
-],[
- NP_APP_CAMERAWIRE=no
-])
-AC_ARG_ENABLE(allapps, [ --enable-allapps Enable all apps],[
- NP_APP_NIEPCE=yes
- NP_APP_CAMERAWIRE=yes
- NP_APPS="niepce,camerawire"
-],[
-
-])
-
-if test -z "$NP_APPS" ; then
- NP_APPS="niepce"
- NP_APP_NIEPCE=yes
-fi
+NP_APPS="niepce"
+NP_APP_NIEPCE=yes
CPPFLAGS="$CPPFLAGS $DEBUG_CFLAGS -Wall -Wcast-align -Wcast-qual -Wpointer-arith -Wreturn-type"
CFLAGS="$CFLAGS $DEBUG_CFLAGS $OPTIMIZE_CFLAGS"
@@ -223,39 +193,6 @@ src/niepce/Makefile
fi
-dnl ================
-dnl camerawire
-dnl ================
-
-AM_CONDITIONAL(CW_BUILD, test "$NP_APP_CAMERAWIRE" = "yes")
-if test "$NP_APP_CAMERAWIRE" = "yes" ; then
-
-MAJOR_VERSION=0
-MINOR_VERSION=0
-MICRO_VERSION=1
-
-CAMERAWIRE_VERSION="$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION"
-AC_SUBST(CAMERAWIRE_VERSION)
-
-CW_GETTEXT_PACKAGE=camerawire
-AC_SUBST(CW_GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED([CW_GETTEXT_PACKAGE], ["$CW_GETTEXT_PACKAGE"],
- [The domain to use with gettext])
-AM_GNU_GETTEXT
-
-CW_LOCALEDIR=[${datadir}/locale]
-AC_SUBST(CW_LOCALEDIR)
-
-AC_DEFINE_UNQUOTED([CW_BUILD_CONFIG], ["$CW_BUILD_CONFIG"], [The string used to hardcode the build config.])
-
-AC_CONFIG_FILES([
-camerawire/Makefile
-camerawire/src/Makefile
-camerawire/po/Makefile.in
-])
-
-fi
-
AC_OUTPUT
echo "
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]