From cf36549fde8f9abcbfaec53c4f5892e5abb43af1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Apitzsch?= Date: Wed, 14 Jun 2017 00:03:01 +0200 Subject: [PATCH] Remove Makefiles --- Makefile.am | 62 ---------------------- autogen.sh | 35 ------------- configure.ac | 86 ------------------------------- data/Makefile.am | 33 ------------ data/pixmaps/Makefile.am | 5 -- gajim/Makefile.am | 20 ------- gajim/data/Makefile.am | 19 ------- gajim/data/activities/Makefile.am | 4 -- gajim/data/emoticons/Makefile.am | 7 --- gajim/data/gui/Makefile.am | 7 --- gajim/data/iconsets/Makefile.am | 10 ---- gajim/data/moods/Makefile.am | 4 -- icons/Makefile.am | 7 --- m4/acinclude.m4 | 49 ------------------ m4/nls.m4 | 31 ----------- m4/python.m4 | 62 ---------------------- plugins/Makefile.am | 15 ------ 17 files changed, 456 deletions(-) delete mode 100644 Makefile.am delete mode 100755 autogen.sh delete mode 100644 configure.ac delete mode 100644 data/Makefile.am delete mode 100644 data/pixmaps/Makefile.am delete mode 100644 gajim/Makefile.am delete mode 100644 gajim/data/Makefile.am delete mode 100644 gajim/data/activities/Makefile.am delete mode 100644 gajim/data/emoticons/Makefile.am delete mode 100644 gajim/data/gui/Makefile.am delete mode 100644 gajim/data/iconsets/Makefile.am delete mode 100644 gajim/data/moods/Makefile.am delete mode 100644 icons/Makefile.am delete mode 100644 m4/acinclude.m4 delete mode 100644 m4/nls.m4 delete mode 100644 m4/python.m4 delete mode 100644 plugins/Makefile.am diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 75faf5a70..000000000 --- a/Makefile.am +++ /dev/null @@ -1,62 +0,0 @@ -SUBDIRS = gajim data po icons plugins - -ACLOCAL_AMFLAGS = -I m4 - -bin_SCRIPTS = scripts/gajim scripts/gajim-history-manager scripts/gajim-remote - -EXTRA_DIST = \ - autogen.sh \ - intltool-extract.in \ - intltool-merge.in \ - intltool-update.in \ - win \ - scripts/gajim.in \ - scripts/gajim-history-manager.in \ - scripts/gajim-remote.in - -DISTCLEANFILES = \ - intltool-extract \ - intltool-merge \ - intltool-update \ - scripts/gajim \ - scripts/gajim-remote \ - scripts/gajim-history-manager - -MAINTAINERCLEANFILES = \ - configure \ - Makefile.in \ - intltool-extract.in \ - intltool-update.in \ - intltool-merge.in \ - ltmain.sh \ - missing \ - mkinstalldirs \ - install-sh \ - compile \ - depcomp \ - config.guess \ - config.log \ - config.sub \ - config.status \ - aclocal.m4 \ - libtool \ - po/POTFILES.in \ - m4/intltool.m4 - -MAINTAINERCLEANDIRS = \ - autom4te.cache \ - build \ - dist - - -test: - ${PYTHON} test/runtests.py -.PHONY: test - -test_nogui: - ${PYTHON} test/runtests.py -n -.PHONY: test_nogui - -doc: - epydoc --config=doc/epydoc.conf -.PHONY: doc diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index 776f47d7b..000000000 --- a/autogen.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env bash - AM_ARGS="--add-missing --gnu --copy -Wno-portability" - CONF_ARGS="" - - echo "[encoding: UTF-8]" > po/POTFILES.in \ - && for p in `ls gajim/data/gui/*.ui`; do echo "[type: gettext/glade]$p" >> \ - po/POTFILES.in; done \ - && ls -1 data/org.gajim.Gajim.appdata.xml.in data/org.gajim.Gajim.desktop.in.in data/gajim-remote.desktop.in.in \ - gajim/*.py gajim/common/*.py gajim/command_system/*.py gajim/command_system/implementation/*.py gajim/common/zeroconf/*.py gajim/plugins/*.py | grep -v ipython_view.py >> \ - po/POTFILES.in \ - && echo -e "data/org.gajim.Gajim.desktop.in\ndata/gajim-remote.desktop.in\ngajim/ipython_view.py" > po/POTFILES.skip || exit 1 - if [ $(find plugins/ -name '*.py' | wc -l) -gt 0 ];then - ls -1 plugins/*/*.py plugins/*/*.ui >> po/POTFILES.skip - fi - if test -z `which pkg-config 2>/dev/null`;then - echo "***Error: pkg-config not found***" - echo "See README.html for build requirements." - exit 1 - fi - - which glibtoolize >/dev/null 2>&1 && LIBTOOLIZE="glibtoolize" || LIBTOOLIZE="libtoolize" - - mkdir -p config - - if [ "$NO_AUTOTOOLS_RUN" ]; then - exit 0 - fi - - intltoolize --force --automake \ - && aclocal -I ./m4 \ - && $LIBTOOLIZE --copy --force --automake \ - && autoheader \ - && autoconf \ - && automake ${AM_ARGS} \ - && ./configure ${CONF_ARGS} $@ diff --git a/configure.ac b/configure.ac deleted file mode 100644 index 03ec71a9d..000000000 --- a/configure.ac +++ /dev/null @@ -1,86 +0,0 @@ -AC_INIT([Gajim - A Jabber Instant Messager], - m4_esyscmd_s([python -c "import os;os.chdir('gajim');from common import defs; print(defs.version)"]),[https://dev.gajim.org/gajim/gajim],[gajim]) -AC_PREREQ([2.59]) - -AC_CONFIG_HEADER(config.h) -AC_CONFIG_AUX_DIR(config) -AC_CONFIG_MACRO_DIR([m4]) - -AM_INIT_AUTOMAKE([1.9 tar-pax]) -AM_MAINTAINER_MODE - -IT_PROG_INTLTOOL([0.35.0]) -PKG_PROG_PKG_CONFIG([0.19]) - -AM_DISABLE_STATIC -AC_ENABLE_SHARED(yes) -AC_ENABLE_STATIC(no) - -AC_ISC_POSIX -AC_PROG_CC -AC_PROG_INSTALL -AC_PROG_MAKE_SET -AC_PROG_LIBTOOL -AC_C_CONST -AC_CHECK_HEADERS([libintl.h]) -AC_PATH_X - - -GETTEXT_PACKAGE=gajim -AC_SUBST([GETTEXT_PACKAGE]) -AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"], [Gettext package]) -AM_GLIB_GNU_GETTEXT -AM_NLS - - -ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}" -AC_SUBST(ACLOCAL_AMFLAGS) - -AM_PATH_PYTHON([3.5]) - -AC_SUBST([gajim_srcdir], [\${pkgpythondir}]) -AC_SUBST([gajim_pluginsdir], [\${datadir}/\${PACKAGE}/plugins]) - -AS_AC_EXPAND(PY_SITEDIR, "${pythondir}") -AS_AC_EXPAND(GAJIM_SRCDIR, "${gajim_srcdir}") -AS_AC_EXPAND(PKGDATADIR, "${datadir}/${PACKAGE}") -AS_AC_EXPAND(DOCDIR, "${docdir}") -AS_AC_EXPAND(LOCALEDIR, "${localedir}") -AS_AC_EXPAND(GAJIM_PLUGINSDIR, "${gajim_pluginsdir}") - -AC_SUBST(VERSION) -AC_SUBST(PACKAGE) - -AC_CONFIG_FILES([ - Makefile - data/Makefile - gajim/data/Makefile - gajim/data/gui/Makefile - gajim/data/emoticons/Makefile - data/pixmaps/Makefile - gajim/data/iconsets/Makefile - gajim/data/moods/Makefile - gajim/data/activities/Makefile - icons/Makefile - data/org.gajim.Gajim.appdata.xml - data/org.gajim.Gajim.desktop.in - data/gajim-remote.desktop.in - data/defs.py - gajim/Makefile - scripts/gajim - scripts/gajim-history-manager - scripts/gajim-remote - po/Makefile.in - plugins/Makefile -]) -AC_OUTPUT -echo " -***************************** - Installation: - Prefix ........... ${prefix} - Python modules ... ${GAJIM_SRCDIR} - Plugins .. ....... ${GAJIM_PLUGINSDIR} - Documentation .... ${DOCDIR} - Others ........... ${PKGDATADIR} -*****************************" - diff --git a/data/Makefile.am b/data/Makefile.am deleted file mode 100644 index 3b02d6d18..000000000 --- a/data/Makefile.am +++ /dev/null @@ -1,33 +0,0 @@ -SUBDIRS = pixmaps -@INTLTOOL_DESKTOP_RULE@ - -appstreamdir = $(datadir)/metainfo/ -appstream_in_files = org.gajim.Gajim.appdata.xml.in -appstream_DATA = $(appstream_in_files:.xml.in=.xml) -@INTLTOOL_XML_RULE@ - -desktopdir = $(datadir)/applications -desktop_in_files = org.gajim.Gajim.desktop.in.in gajim-remote.desktop.in.in -desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop) - -installdefsdir = $(gajim_srcdir)/common -installdefs_DATA = defs.py - - -man_MANS = gajim.1 gajim-remote.1 gajim-history-manager.1 - - -EXTRA_DIST = $(appstream_in_files) \ - $(desktop_in_files) \ - $(man_MANS) \ - defs.py.in - - -DISTCLEANFILES = $(desktop_DATA) \ - $(installdefs_DATA) - -CLEANFILES = $(appstream_DATA) \ - org.gajim.Gajim.desktop \ - gajim-remote.desktop - -MAINTAINERCLEANFILES = Makefile.in diff --git a/data/pixmaps/Makefile.am b/data/pixmaps/Makefile.am deleted file mode 100644 index a7eadc116..000000000 --- a/data/pixmaps/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -pixmapsdir = $(pkgdatadir)/data/pixmaps -nobase_dist_pixmaps_DATA = \ - $(srcdir)/gajim.ico - -MAINTAINERCLEANFILES = Makefile.in diff --git a/gajim/Makefile.am b/gajim/Makefile.am deleted file mode 100644 index c9bfb66bb..000000000 --- a/gajim/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -SUBDIRS = data - -INCLUDES = \ - $(PYTHON_INCLUDES) -export MACOSX_DEPLOYMENT_TARGET=10.4 - -gajimsrcdir = $(gajim_srcdir) -nobase_dist_gajimsrc_PYTHON = \ - $(srcdir)/*.py \ - $(srcdir)/common/*.py \ - $(srcdir)/common/protocol/*.py \ - $(srcdir)/common/zeroconf/*.py \ - $(srcdir)/command_system/*.py \ - $(srcdir)/command_system/implementation/*.py \ - $(srcdir)/plugins/*.py - -dist-hook: - rm -f $(distdir)/ipython_view.py - -MAINTAINERCLEANFILES = Makefile.in diff --git a/gajim/data/Makefile.am b/gajim/data/Makefile.am deleted file mode 100644 index bee085790..000000000 --- a/gajim/data/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -SUBDIRS = gui emoticons iconsets moods activities -@INTLTOOL_DESKTOP_RULE@ - -soundsdir = $(gajim_srcdir)/data/sounds -sounds_DATA = $(srcdir)/sounds/*.wav - -styledir = $(gajim_srcdir)/data/style -style_DATA = $(srcdir)/style/*.css - -otherdir = $(gajim_srcdir)/data/other -other_DATA = other/servers.xml other/dh4096.pem -# other/cacert.pem is used only on Windows. On Unix platforms -# use CA certificates installed in /etc/ssl/certs - -EXTRA_DIST = $(sounds_DATA) \ - $(style_DATA) \ - $(other_DATA) - -MAINTAINERCLEANFILES = Makefile.in diff --git a/gajim/data/activities/Makefile.am b/gajim/data/activities/Makefile.am deleted file mode 100644 index 12f725a6b..000000000 --- a/gajim/data/activities/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -activitiesdir = $(gajim_srcdir)/data/activities -nobase_dist_activities_DATA = $(srcdir)/*/*/* - -MAINTAINERCLEANFILES = Makefile.in diff --git a/gajim/data/emoticons/Makefile.am b/gajim/data/emoticons/Makefile.am deleted file mode 100644 index 417267dd6..000000000 --- a/gajim/data/emoticons/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -emoticonsdir = $(gajim_srcdir)/data/emoticons -nobase_dist_emoticons_DATA = \ - $(srcdir)/*/*.png \ - $(srcdir)/*/LICENSE \ - $(srcdir)/*/emoticons_theme.py - -MAINTAINERCLEANFILES = Makefile.in diff --git a/gajim/data/gui/Makefile.am b/gajim/data/gui/Makefile.am deleted file mode 100644 index a0908cec3..000000000 --- a/gajim/data/gui/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -guidir = $(gajim_srcdir)/data/gui -gui_DATA = $(srcdir)/*.ui -EXTRA_DIST = $(gui_DATA) - -DISTCLEANFILES = *.h - -MAINTAINERCLEANFILES = Makefile.in diff --git a/gajim/data/iconsets/Makefile.am b/gajim/data/iconsets/Makefile.am deleted file mode 100644 index a938009f1..000000000 --- a/gajim/data/iconsets/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -iconsetdir = $(gajim_srcdir)/data/iconsets -nobase_dist_iconset_DATA = \ - $(srcdir)/*/16x16/* \ - $(srcdir)/*/32x32/* \ - $(srcdir)/*/48x48/* \ - $(srcdir)/transports/*/16x16/* \ - $(srcdir)/transports/*/32x32/* \ - $(srcdir)/transports/*/48x48/* - -MAINTAINERCLEANFILES = Makefile.in diff --git a/gajim/data/moods/Makefile.am b/gajim/data/moods/Makefile.am deleted file mode 100644 index 2e579b47d..000000000 --- a/gajim/data/moods/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -moodsdir = $(gajim_srcdir)/data/moods -nobase_dist_moods_DATA = $(srcdir)/*/* - -MAINTAINERCLEANFILES = Makefile.in diff --git a/icons/Makefile.am b/icons/Makefile.am deleted file mode 100644 index 2c6fcec2e..000000000 --- a/icons/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -iconsdir = $(pkgdatadir)/icons -nobase_dist_icons_DATA = $(srcdir)/*/*/*/* - -systemiconsdir = $(datadir)/icons -nobase_dist_systemicons_DATA = $(srcdir)/*/*/*/org.gajim.Gajim.* - -MAINTAINERCLEANFILES = Makefile.in diff --git a/m4/acinclude.m4 b/m4/acinclude.m4 deleted file mode 100644 index deebd2bf8..000000000 --- a/m4/acinclude.m4 +++ /dev/null @@ -1,49 +0,0 @@ -dnl as-ac-expand.m4 0.2.0 -*- autoconf -*- -dnl autostars m4 macro for expanding directories using configure's prefix - -dnl (C) 2003, 2004, 2005 Thomas Vander Stichele - -dnl Copying and distribution of this file, with or without modification, -dnl are permitted in any medium without royalty provided the copyright -dnl notice and this notice are preserved. - -dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR) - -dnl example: -dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir) -dnl will set SYSCONFDIR to /usr/local/etc if prefix=/usr/local - -AC_DEFUN([AS_AC_EXPAND], -[ - EXP_VAR=[$1] - FROM_VAR=[$2] - - dnl first expand prefix and exec_prefix if necessary - prefix_save=$prefix - exec_prefix_save=$exec_prefix - - dnl if no prefix given, then use /usr/local, the default prefix - if test "x$prefix" = "xNONE"; then - prefix="$ac_default_prefix" - fi - dnl if no exec_prefix given, then use prefix - if test "x$exec_prefix" = "xNONE"; then - exec_prefix=$prefix - fi - - full_var="$FROM_VAR" - dnl loop until it doesn't change anymore - while true; do - new_full_var="`eval echo $full_var`" - if test "x$new_full_var" = "x$full_var"; then break; fi - full_var=$new_full_var - done - - dnl clean up - full_var=$new_full_var - AC_SUBST([$1], "$full_var") - - dnl restore prefix and exec_prefix - prefix=$prefix_save - exec_prefix=$exec_prefix_save -]) diff --git a/m4/nls.m4 b/m4/nls.m4 deleted file mode 100644 index 7967cc2f9..000000000 --- a/m4/nls.m4 +++ /dev/null @@ -1,31 +0,0 @@ -# nls.m4 serial 3 (gettext-0.15) -dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. -dnl -dnl This file can can be used in projects which are not available under -dnl the GNU General Public License or the GNU Library General Public -dnl License but which still want to provide support for the GNU gettext -dnl functionality. -dnl Please note that the actual code of the GNU gettext library is covered -dnl by the GNU Library General Public License, and the rest of the GNU -dnl gettext package package is covered by the GNU General Public License. -dnl They are *not* in the public domain. - -dnl Authors: -dnl Ulrich Drepper , 1995-2000. -dnl Bruno Haible , 2000-2003. - -AC_PREREQ(2.50) - -AC_DEFUN([AM_NLS], -[ - AC_MSG_CHECKING([whether NLS is requested]) - dnl Default is enabled NLS - AC_ARG_ENABLE(nls, - [ --disable-nls do not use Native Language Support], - USE_NLS=$enableval, USE_NLS=yes) - AC_MSG_RESULT($USE_NLS) - AC_SUBST(USE_NLS) -]) diff --git a/m4/python.m4 b/m4/python.m4 deleted file mode 100644 index 533d2f883..000000000 --- a/m4/python.m4 +++ /dev/null @@ -1,62 +0,0 @@ -## this one is commonly used with AM_PATH_PYTHONDIR ... -dnl AM_CHECK_PYMOD(MODNAME [,SYMBOL [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]]) -dnl Check if a module containing a given symbol is visible to python. -AC_DEFUN([AM_CHECK_PYMOD], -[AC_REQUIRE([AM_PATH_PYTHON]) -py_mod_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'` -AC_MSG_CHECKING(for ifelse([$2],[],,[$2 in ])python module $1) -AC_CACHE_VAL(py_cv_mod_$py_mod_var, [ -ifelse([$2],[], [prog=" -import sys -try: - import $1 -except ImportError: - sys.exit(1) -except: - sys.exit(0) -sys.exit(0)"], [prog=" -import $1 -$1.$2"]) -if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC - then - eval "py_cv_mod_$py_mod_var=yes" - else - eval "py_cv_mod_$py_mod_var=no" - fi -]) -py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"` -if test "x$py_val" != xno; then - AC_MSG_RESULT(yes) - ifelse([$3], [],, [$3 -])dnl -else - AC_MSG_RESULT(no) - ifelse([$4], [],, [$4 -])dnl -fi -]) - -dnl a macro to check for ability to create python extensions -dnl AM_CHECK_PYTHON_HEADERS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE]) -dnl function also defines PYTHON_INCLUDES -AC_DEFUN([AM_CHECK_PYTHON_HEADERS], -[AC_REQUIRE([AM_PATH_PYTHON]) -AC_MSG_CHECKING(for headers required to compile python extensions) -dnl deduce PYTHON_INCLUDES -py_prefix=`$PYTHON -c "import sys; print(sys.prefix)"` -py_exec_prefix=`$PYTHON -c "import sys; print(sys.exec_prefix)"` -PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" -if test "$py_prefix" != "$py_exec_prefix"; then - PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" -fi -AC_SUBST(PYTHON_INCLUDES) -dnl check if the headers exist: -save_CPPFLAGS="$CPPFLAGS" -CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES" -AC_TRY_CPP([#include ],dnl -[AC_MSG_RESULT(found) -$1],dnl -[AC_MSG_RESULT(not found) -$2]) -CPPFLAGS="$save_CPPFLAGS" -]) diff --git a/plugins/Makefile.am b/plugins/Makefile.am deleted file mode 100644 index 1676b2828..000000000 --- a/plugins/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -INCLUDES = \ - $(PYTHON_INCLUDES) - -gajimpluginsdir = $(gajim_pluginsdir) - -dist_gajimplugins_PYTHON = - -pluginsdirs = ${sort ${dir ${wildcard ${srcdir}/*/ ${srcdir}/*/*/}}} - -pluginsfiles = $(wildcard ${p}/*.py ${p}/manifest.ini ${p}/*.ui ${p}/*.png ${p}/*.pem) - -nobase_gajimplugins_DATA = $(foreach p, ${pluginsdirs}, $(pluginsfiles)) - - -MAINTAINERCLEANFILES = Makefile.in