[almanah/wip/jtojnar/meson: 2/2] build: Remove autotools



commit b07312889965be4a630dbd79d748b4e1a88b6005
Author: Jan Tojnar <jtojnar gmail com>
Date:   Fri Mar 8 13:26:14 2019 +0100

    build: Remove autotools

 ChangeLog.pre-git                           | 1361 ---------------------------
 Makefile.am                                 |   67 --
 autogen.sh                                  |   38 -
 configure.ac                                |  171 ----
 data/Makefile.am                            |   72 --
 data/icons/16x16/Makefile.am                |    6 -
 data/icons/22x22/Makefile.am                |    6 -
 data/icons/256x256/Makefile.am              |    6 -
 data/icons/32x32/Makefile.am                |    6 -
 data/icons/48x48/Makefile.am                |    6 -
 data/icons/Makefile.am                      |    3 -
 data/icons/scalable/Makefile.am             |   11 -
 git.mk                                      |  316 -------
 intltool-extract.in                         |    0
 intltool-merge.in                           |    0
 intltool-update.in                          |    0
 po/ChangeLog                                |  274 ------
 src/Makefile.am                             |  148 ---
 src/enums.c.template                        |   56 --
 src/enums.h.template                        |   43 -
 src/event-factories/e-cell-renderer-color.c |    2 -
 src/event-factories/e-source-selector.c     |    2 -
 src/meson.build                             |    6 -
 src/widgets/eggwrapbox.c                    |    2 -
 tests/Makefile.am                           |   17 -
 25 files changed, 2619 deletions(-)
---
diff --git a/src/event-factories/e-cell-renderer-color.c b/src/event-factories/e-cell-renderer-color.c
index 15e7fe5..a262fa1 100644
--- a/src/event-factories/e-cell-renderer-color.c
+++ b/src/event-factories/e-cell-renderer-color.c
@@ -16,9 +16,7 @@
  * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "e-cell-renderer-color.h"
 
diff --git a/src/event-factories/e-source-selector.c b/src/event-factories/e-source-selector.c
index 70619a7..0efdb19 100644
--- a/src/event-factories/e-source-selector.c
+++ b/src/event-factories/e-source-selector.c
@@ -21,9 +21,7 @@
  * Author: Ettore Perazzoli <ettore ximian com>
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <string.h>
 
diff --git a/src/meson.build b/src/meson.build
index 25d7bae..8ee6c28 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -60,11 +60,6 @@ sources += gnome.mkenums_simple(
   sources: enum_headers,
 )
 
-cflags = [
-  # TODO: get rid of this with autotools
-  '-DHAVE_CONFIG_H=1',
-]
-
 inc = include_directories(
   '..',
   'events',
@@ -76,6 +71,5 @@ almanah = executable(
   sources,
   dependencies: almanah_deps,
   include_directories: inc,
-  c_args: cflags,
   install: true,
 )
diff --git a/src/widgets/eggwrapbox.c b/src/widgets/eggwrapbox.c
index 16d598d..11d6964 100644
--- a/src/widgets/eggwrapbox.c
+++ b/src/widgets/eggwrapbox.c
@@ -38,9 +38,7 @@
  * Unlike a GtkTable, the child widgets do not need to align in a grid.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "eggwrapbox.h"
 #include "eggwrapbox-enums.h"


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