From 48167c9de89477a9898fce237ce3abf382abb1b4 Mon Sep 17 00:00:00 2001 From: Hans Petter Jansson Date: Thu, 5 Oct 2023 15:20:54 +0200 Subject: Remove Autotools build files - support only Meson from now on --- Makefile.am | 35 ---------- autogen.sh | 64 ----------------- configure.ac | 105 ---------------------------- git.mk | 206 ------------------------------------------------------- man/Makefile.am | 19 ----- misc/Makefile.am | 3 - src/Makefile.am | 48 ------------- 7 files changed, 480 deletions(-) delete mode 100644 Makefile.am delete mode 100755 autogen.sh delete mode 100644 configure.ac delete mode 100644 git.mk delete mode 100644 man/Makefile.am delete mode 100644 misc/Makefile.am delete mode 100644 src/Makefile.am diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index d89da19..0000000 --- a/Makefile.am +++ /dev/null @@ -1,35 +0,0 @@ -SUBDIRS = src man misc - -ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} - -EXTRA_DIST = HACKING - -MAINTAINERCLEANFILES = \ - $(srcdir)/aclocal.m4 \ - $(srcdir)/config.guess \ - $(srcdir)/config.h.in \ - $(srcdir)/config.sub \ - $(srcdir)/depcomp \ - $(srcdir)/elisp-comp \ - $(srcdir)/install-sh \ - $(srcdir)/ltmain.sh \ - $(srcdir)/missing \ - `find "$(srcdir)" -type f -name Makefile.in -print` \ - $(srcdir)/configure \ - $(srcdir)/m4/*.m4 - -CHANGELOG_GIT_RANGE = -dist-hook: - $(AM_V_GEN)if test -d "$(srcdir)/.git"; then \ - ( echo '# Generated by Makefile. Do not edit.'; echo; \ - GIT_DIR="$(top_srcdir)/.git" ./missing --run \ - git log $(CHANGELOG_GIT_RANGE) --no-color -M -C --name-status ) \ - > ChangeLog.tmp \ - && mv -f ChangeLog.tmp $(distdir)/ChangeLog \ - || ( rm -f ChangeLog.tmp ; echo Failed to generate ChangeLog >&2 ); \ - else \ - echo A git checkout is required to generate ChangeLog >&2; \ - fi - -GITIGNOREFILES = $(PACKAGE)-\*.tar.{gz,bz2,xz} --include $(top_srcdir)/git.mk diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index 77e6151..0000000 --- a/autogen.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/sh -# Run this to generate all the initial makefiles, etc. - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -ORIGDIR=`pwd` -cd $srcdir - -PROJECT=desktop-file-utils -TEST_TYPE=-f -FILE=src/validate.h - -DIE=0 - -(autoconf --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "You must have autoconf installed to compile $PROJECT." - echo "Download the appropriate package for your distribution," - echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" - DIE=1 -} - -AUTOMAKE=automake -ACLOCAL=aclocal - -($AUTOMAKE --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "You must have automake installed to compile $PROJECT." - echo "Download the appropriate package for your distribution," - echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" - DIE=1 -} - -if test "$DIE" -eq 1; then - exit 1 -fi - -test $TEST_TYPE $FILE || { - echo "You must run this script in the top-level $PROJECT directory" - exit 1 -} - -if test -z "$*"; then - echo "I am going to run ./configure with no arguments - if you wish " - echo "to pass any to it, please specify them on the $0 command line." -fi - -echo $ACLOCAL $ACLOCAL_FLAGS -$ACLOCAL $ACLOCAL_FLAGS - -# optionally feature autoheader -(autoheader --version) < /dev/null > /dev/null 2>&1 && autoheader - -$AUTOMAKE -a $am_opt -autoconf || echo "autoconf failed - version 2.5x is probably required" - -cd $ORIGDIR - -if test -z "$NOCONFIGURE"; then - $srcdir/configure "$@" - echo - echo "Now type 'make' to compile $PROJECT." -fi diff --git a/configure.ac b/configure.ac deleted file mode 100644 index 84c598a..0000000 --- a/configure.ac +++ /dev/null @@ -1,105 +0,0 @@ -AC_INIT([desktop-file-utils], [0.27], - [https://bugs.freedesktop.org/enter_bug.cgi?product=desktop-file-utils]) -AC_CONFIG_SRCDIR(src/validate.h) - -AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz tar-ustar]) -m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) -AC_CONFIG_MACRO_DIR([m4]) -AM_CONFIG_HEADER(config.h) - -AC_PROG_LN_S -AC_PROG_CC - -AC_CHECK_FUNCS(pledge) - -if test "x$GCC" = "xyes"; then - changequote(,)dnl - case " $CFLAGS " in - *[\ \ ]-Wall[\ \ ]*) ;; - *) CFLAGS="$CFLAGS -Wall" ;; - esac - - case " $CFLAGS " in - *[\ \ ]-Wchar-subscripts[\ \ ]*) ;; - *) CFLAGS="$CFLAGS -Wchar-subscripts" ;; - esac - - case " $CFLAGS " in - *[\ \ ]-Wmissing-declarations[\ \ ]*) ;; - *) CFLAGS="$CFLAGS -Wmissing-declarations" ;; - esac - - case " $CFLAGS " in - *[\ \ ]-Wmissing-prototypes[\ \ ]*) ;; - *) CFLAGS="$CFLAGS -Wmissing-prototypes" ;; - esac - - case " $CFLAGS " in - *[\ \ ]-Wnested-externs[\ \ ]*) ;; - *) CFLAGS="$CFLAGS -Wnested-externs" ;; - esac - - case " $CFLAGS " in - *[\ \ ]-Wpointer-arith[\ \ ]*) ;; - *) CFLAGS="$CFLAGS -Wpointer-arith" ;; - esac - - case " $CFLAGS " in - *[\ \ ]-Wcast-align[\ \ ]*) ;; - *) CFLAGS="$CFLAGS -Wcast-align" ;; - esac - - case " $CFLAGS " in - *[\ \ ]-Wsign-compare[\ \ ]*) ;; - *) CFLAGS="$CFLAGS -Wsign-compare" ;; - esac - - if test "x$enable_ansi" = "xyes"; then - case " $CFLAGS " in - *[\ \ ]-ansi[\ \ ]*) ;; - *) CFLAGS="$CFLAGS -ansi" ;; - esac - - case " $CFLAGS " in - *[\ \ ]-pedantic[\ \ ]*) ;; - *) CFLAGS="$CFLAGS -pedantic" ;; - esac - fi - if test x$enable_gcov = xyes; then - case " $CFLAGS " in - *[\ \ ]-fprofile-arcs[\ \ ]*) ;; - *) CFLAGS="$CFLAGS -fprofile-arcs" ;; - esac - case " $CFLAGS " in - *[\ \ ]-ftest-coverage[\ \ ]*) ;; - *) CFLAGS="$CFLAGS -ftest-coverage" ;; - esac - - ## remove optimization - CFLAGS=`echo "$CFLAGS" | sed -e 's/-O[0-9]*//g'` - fi - changequote([,])dnl -else - if test x$enable_gcov = xyes; then - AC_MSG_ERROR([--enable-gcov can only be used with gcc]) - fi -fi - -changequote(,)dnl -# compress spaces in flags -CFLAGS=`echo "$CFLAGS" | sed -e 's/ +/ /g'` -CPPFLAGS=`echo "$CPPFLAGS" | sed -e 's/ +/ /g'` -changequote([,])dnl - -PKG_CHECK_MODULES(DESKTOP_FILE_UTILS, glib-2.0 >= 2.8.0) - -AM_PATH_LISPDIR - -AC_CONFIG_FILES([ -Makefile -man/Makefile -misc/Makefile -src/Makefile -]) - -AC_OUTPUT diff --git a/git.mk b/git.mk deleted file mode 100644 index ff5c0c3..0000000 --- a/git.mk +++ /dev/null @@ -1,206 +0,0 @@ -# git.mk -# -# Copyright 2009, Red Hat, Inc. -# Copyright 2010,2011 Behdad Esfahbod -# Written by Behdad Esfahbod -# -# Copying and distribution of this file, with or without modification, -# are permitted in any medium without royalty provided the copyright -# notice and this notice are preserved. -# -# The canonical source for this file is https://github.com/behdad/git.mk. -# -# To use in your project, import this file in your git repo's toplevel, -# then do "make -f git.mk". This modifies all Makefile.am files in -# your project to -include git.mk. Remember to add that line to new -# Makefile.am files you create in your project, or just rerun the -# "make -f git.mk". -# -# This enables automatic .gitignore generation. If you need to ignore -# more files, add them to the GITIGNOREFILES variable in your Makefile.am. -# But think twice before doing that. If a file has to be in .gitignore, -# chances are very high that it's a generated file and should be in one -# of MOSTLYCLEANFILES, CLEANFILES, DISTCLEANFILES, or MAINTAINERCLEANFILES. -# -# The only case that you need to manually add a file to GITIGNOREFILES is -# when remove files in one of mostlyclean-local, clean-local, distclean-local, -# or maintainer-clean-local make targets. -# -# Note that for files like editor backup, etc, there are better places to -# ignore them. See "man gitignore". -# -# If "make maintainer-clean" removes the files but they are not recognized -# by this script (that is, if "git status" shows untracked files still), send -# me the output of "git status" as well as your Makefile.am and Makefile for -# the directories involved and I'll diagnose. -# -# For a list of toplevel files that should be in MAINTAINERCLEANFILES, see -# Makefile.am.sample in the git.mk git repo. -# -# Don't EXTRA_DIST this file. It is supposed to only live in git clones, -# not tarballs. It serves no useful purpose in tarballs and clutters the -# build dir. -# -# This file knows how to handle autoconf, automake, libtool, gtk-doc, -# gnome-doc-utils, yelp.m4, mallard, intltool, gsettings. -# -# -# KNOWN ISSUES: -# -# - Recursive configure doesn't work as $(top_srcdir)/git.mk inside the -# submodule doesn't find us. If you have configure.{in,ac} files in -# subdirs, add a proxy git.mk file in those dirs that simply does: -# "include $(top_srcdir)/../git.mk". Add more ..'s to your taste. -# And add those files to git. See vte/gnome-pty-helper/git.mk for -# example. -# - -git-all: git-mk-install - -git-mk-install: - @echo Installing git makefile - @any_failed=; \ - find "`test -z "$(top_srcdir)" && echo . || echo "$(top_srcdir)"`" -name Makefile.am | while read x; do \ - if grep 'include .*/git.mk' $$x >/dev/null; then \ - echo $$x already includes git.mk; \ - else \ - failed=; \ - echo "Updating $$x"; \ - { cat $$x; \ - echo ''; \ - echo '-include $$(top_srcdir)/git.mk'; \ - } > $$x.tmp || failed=1; \ - if test x$$failed = x; then \ - mv $$x.tmp $$x || failed=1; \ - fi; \ - if test x$$failed = x; then : else \ - echo Failed updating $$x; >&2 \ - any_failed=1; \ - fi; \ - fi; done; test -z "$$any_failed" - -.PHONY: git-all git-mk-install - - -### .gitignore generation - -$(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk - $(AM_V_GEN) \ - { \ - if test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x; then :; else \ - for x in \ - $(DOC_MODULE)-decl-list.txt \ - $(DOC_MODULE)-decl.txt \ - tmpl/$(DOC_MODULE)-unused.sgml \ - "tmpl/*.bak" \ - xml html \ - ; do echo /$$x; done; \ - fi; \ - if test "x$(DOC_MODULE)$(DOC_ID)" = x -o "x$(DOC_LINGUAS)" = x; then :; else \ - for x in \ - $(_DOC_C_DOCS) \ - $(_DOC_LC_DOCS) \ - $(_DOC_OMF_ALL) \ - $(_DOC_DSK_ALL) \ - $(_DOC_HTML_ALL) \ - $(_DOC_MOFILES) \ - $(_DOC_POFILES) \ - $(DOC_H_FILE) \ - "*/.xml2po.mo" \ - "*/*.omf.out" \ - ; do echo /$$x; done; \ - fi; \ - if test "x$(HELP_ID)" = x -o "x$(HELP_LINGUAS)" = x; then :; else \ - for x in \ - $(_HELP_LC_FILES) \ - $(_HELP_LC_STAMPS) \ - $(_HELP_MOFILES) \ - ; do echo /$$x; done; \ - fi; \ - if test "x$(gsettings_SCHEMAS)" = x; then :; else \ - for x in \ - $(gsettings_SCHEMAS:.xml=.valid) \ - $(gsettings__enum_file) \ - ; do echo /$$x; done; \ - fi; \ - if test -f $(srcdir)/po/Makefile.in.in; then \ - for x in \ - po/Makefile.in.in \ - po/Makefile.in \ - po/Makefile \ - po/POTFILES \ - po/stamp-it \ - po/.intltool-merge-cache \ - "po/*.gmo" \ - "po/*.mo" \ - po/$(GETTEXT_PACKAGE).pot \ - intltool-extract.in \ - intltool-merge.in \ - intltool-update.in \ - ; do echo /$$x; done; \ - fi; \ - if test -f $(srcdir)/configure; then \ - for x in \ - autom4te.cache \ - configure \ - config.h \ - stamp-h1 \ - libtool \ - config.lt \ - ; do echo /$$x; done; \ - fi; \ - for x in \ - .gitignore \ - $(GITIGNOREFILES) \ - $(CLEANFILES) \ - $(PROGRAMS) \ - $(check_PROGRAMS) \ - $(EXTRA_PROGRAMS) \ - $(LTLIBRARIES) \ - so_locations \ - .libs _libs \ - $(MOSTLYCLEANFILES) \ - "*.$(OBJEXT)" \ - "*.lo" \ - $(DISTCLEANFILES) \ - $(am__CONFIG_DISTCLEAN_FILES) \ - $(CONFIG_CLEAN_FILES) \ - TAGS ID GTAGS GRTAGS GSYMS GPATH tags \ - "*.tab.c" \ - $(MAINTAINERCLEANFILES) \ - $(BUILT_SOURCES) \ - $(DEPDIR) \ - Makefile \ - Makefile.in \ - "*.orig" \ - "*.rej" \ - "*.bak" \ - "*~" \ - ".*.sw[nop]" \ - ".dirstamp" \ - ; do echo /$$x; done; \ - } | \ - sed "s@^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \ - sed 's@/[.]/@/@g' | \ - LC_ALL=C sort | uniq > $@.tmp && \ - mv $@.tmp $@; - -all: $(srcdir)/.gitignore gitignore-recurse-maybe -gitignore-recurse-maybe: - @if test "x$(SUBDIRS)" = "x$(DIST_SUBDIRS)"; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) gitignore-recurse; \ - fi; -gitignore-recurse: - @for subdir in $(DIST_SUBDIRS); do \ - case " $(SUBDIRS) " in \ - *" $$subdir "*) :;; \ - *) test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore gitignore-recurse || echo "Skipping $$subdir");; \ - esac; \ - done -gitignore: $(srcdir)/.gitignore gitignore-recurse - -maintainer-clean: gitignore-clean -gitignore-clean: - -rm -f $(srcdir)/.gitignore - -.PHONY: gitignore-clean gitignore gitignore-recurse gitignore-recurse-maybe diff --git a/man/Makefile.am b/man/Makefile.am deleted file mode 100644 index 8303977..0000000 --- a/man/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -man_MANS = \ - desktop-file-validate.1 \ - desktop-file-install.1 \ - update-desktop-database.1 - -install-exec-hook: - test -d $(DESTDIR)$(mandir)/man1 || mkdir -p $(DESTDIR)$(mandir)/man1 - cd $(DESTDIR)$(mandir)/man1 && \ - rm -f desktop-file-edit.1 && \ - $(LN_S) -f desktop-file-install.1 desktop-file-edit.1 - -uninstall-hook: - test -d $(DESTDIR)$(mandir)/man1 && \ - cd $(DESTDIR)$(mandir)/man1 && \ - rm -f desktop-file-edit.1 - -EXTRA_DIST = $(man_MANS) - --include $(top_srcdir)/git.mk diff --git a/misc/Makefile.am b/misc/Makefile.am deleted file mode 100644 index e14541d..0000000 --- a/misc/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -dist_lisp_DATA = desktop-entry-mode.el - --include $(top_srcdir)/git.mk diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index 3ebf03d..0000000 --- a/src/Makefile.am +++ /dev/null @@ -1,48 +0,0 @@ -bin_PROGRAMS = \ - desktop-file-validate \ - desktop-file-install \ - update-desktop-database - -AM_CPPFLAGS = \ - $(DESKTOP_FILE_UTILS_CFLAGS) \ - -DDATADIR="\"$(datadir)\"" \ - -D_FILE_OFFSET_BITS=64 \ - -D_LARGEFILE64_SOURCE - -desktop_file_validate_SOURCES = \ - keyfileutils.c \ - keyfileutils.h \ - mimeutils.c \ - mimeutils.h \ - validate.c \ - validate.h \ - validator.c - -desktop_file_install_SOURCES = \ - keyfileutils.c \ - keyfileutils.h \ - mimeutils.c \ - mimeutils.h \ - validate.c \ - validate.h \ - install.c - -update_desktop_database_SOURCES = \ - mimeutils.c \ - mimeutils.h \ - update-desktop-database.c - -desktop_file_validate_LDADD = $(DESKTOP_FILE_UTILS_LIBS) -desktop_file_install_LDADD = $(DESKTOP_FILE_UTILS_LIBS) -update_desktop_database_LDADD = $(DESKTOP_FILE_UTILS_LIBS) - -install-exec-hook: desktop-file-install - cd $(DESTDIR)$(bindir) && \ - rm -f desktop-file-edit && \ - $(LN_S) -f desktop-file-install desktop-file-edit - -uninstall-hook: - cd $(DESTDIR)$(bindir) && \ - rm -f desktop-file-edit - --include $(top_srcdir)/git.mk -- cgit v1.2.3