nyje
/
medit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move a bunch of defines to config.h

master
Yevgen Muntyan 2016-01-08 04:41:48 -08:00
parent f234edba47
commit 0a08c170f0
9 changed files with 29 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@ -186,19 +186,23 @@ set(MOO_PYTHON "${PYTHON_EXECUTABLE}")
set(MOO_ENABLE_PYTHON TRUE CACHE BOOL "Use python")
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-cmake.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
add_definitions(-DMOO_COMPILATION=1 -DHAVE_CONFIG_H=1 -DXDG_PREFIX=_moo_edit_xdg -DG_LOG_DOMAIN=\"Moo\")
add_definitions(-DHAVE_CONFIG_H=1 -DXDG_PREFIX=_moo_edit_xdg -DG_LOG_DOMAIN=\"Moo\")
if(WIN32)
add_definitions(-DUNICODE=1 -D_UNICODE=1 -D__WIN32__=1 -DSTRICT=1 -D_CRT_SECURE_NO_WARNINGS=1 -D_CRT_NONSTDC_NO_WARNINGS=1)
add_definitions(-DMOO_NEED_GETTIMEOFDAY=1)
add_definitions(-DHAVE_UNISTD_H=1 -DENABLE_NLS=1 -DHAVE_BIND_TEXTDOMAIN_CODESET=1)
set(MOO_NEED_GETTIMEOFDAY TRUE)
set(HAVE_UNISTD_H TRUE)
set(HAVE_BIND_TEXTDOMAIN_CODESET TRUE)
endif(WIN32)
# zzz SUBDIRS = po po-gsv api doc moo
add_subdirectory(api)
# add_subdirectory(doc)
#set(ENABLE_NLS TRUE)
#add_subdirectory(po)
#add_subdirectory(po-gsv)
add_subdirectory(moo)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-cmake.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)

21
config-cmake.h.in
View File

@ -2,8 +2,6 @@
#define MOO_PACKAGE_NAME "@MOO_PACKAGE_NAME@"
#define MOO_DISPLAY_VERSION "@MOO_DISPLAY_VERSION@"
#define MOO_WEBSITE "@MOO_WEBSITE@"
#define MOO_WEB_CONTACT "@MOO_WEB_CONTACT@"
#define MOO_EMAIL "@MOO_EMAIL@"
@ -28,3 +26,22 @@
#define MOO_MINOR_VERSION @MOO_MINOR_VERSION@
#define MOO_MODULE_MAJOR_VERSION @MOO_MODULE_MAJOR_VERSION@
#define MOO_MODULE_MINOR_VERSION @MOO_MODULE_MINOR_VERSION@
#cmakedefine MOO_BUILD_CTAGS 1
#cmakedefine MOO_ENABLE_COVERAGE 1
#cmakedefine MOO_ENABLE_PYTHON 1
#cmakedefine MOO_BROKEN_GTK_THEME 1
#cmakedefine MOO_NEED_GETTIMEOFDAY 1
#cmakedefine ENABLE_NLS 1
#cmakedefine HAVE_BIND_TEXTDOMAIN_CODESET 1
#cmakedefine HAVE_GETC_UNLOCKED 1
#cmakedefine HAVE_MMAP 1
#cmakedefine HAVE_UNISTD_H 1
#cmakedefine HAVE_SYS_UTSNAME_H 1
#cmakedefine HAVE_SIGNAL_H 1
#cmakedefine HAVE_SYS_WAIT_H 1
#define MOO_CONFIG_H_INCLUDED 1
#include <moo-config.h>

8
configure.ac
View File

@ -84,6 +84,7 @@ if test x$MOO_DEV_MODE = "xyes" -a "x$XSLTPROC" = "x"; then
AC_MSG_ERROR([xsltproc not found])
fi
AC_DEFINE(MOO_CONFIG_H_INCLUDED, 1)
AC_CONFIG_HEADERS([config.h])
AH_TOP([#ifndef __CONFIG_H__
#define __CONFIG_H__])
@ -126,13 +127,6 @@ if $MOO_BUILD_MODULE; then
fi
fi
if $MOO_BUILD_APP; then
AC_DEFINE(MOO_BUILD_APP, 1, [build medit application])
fi
if $MOO_BUILD_MODULE; then
AC_DEFINE(MOO_BUILD_MODULE, 1, [build standalone python module])
fi
AM_CONDITIONAL(MOO_BUILD_APP, [$MOO_BUILD_APP])
AM_CONDITIONAL(MOO_BUILD_MODULE, [$MOO_BUILD_MODULE])

2
m4/moo-flags.m4
View File

@ -194,8 +194,6 @@ AC_DEFUN_ONCE([MOO_AC_FLAGS],[
AC_CHECK_FUNCS(mmap)
AC_DEFINE(MOO_COMPILATION, 1, [must be 1])
moo_top_src_dir=`cd $srcdir && pwd`
MOO_CFLAGS="$MOO_CFLAGS $GTK_CFLAGS"
MOO_CXXFLAGS="$MOO_CXXFLAGS $GTK_CFLAGS"

1
m4/moo-intltool.m4
View File

@ -24,6 +24,7 @@ AC_DEFUN([MOO_INTL],[
AC_SUBST([ENABLE_NLS])
if test "$ENABLE_NLS" = "yes"; then
_MOO_INTLTOOL
AC_DEFINE(ENABLE_NLS, 1)
else
_MOO_INTLTOOL_NO_NLS
fi

9
moo/mooapp/mooapp.c
View File

@ -17,11 +17,8 @@
* class:MooApp: (parent GObject): application object
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#define WANT_MOO_APP_CMD_CHARS
#include "mooapp-private.h"
#include "eggsmclient/eggsmclient.h"
#include "mooapp-accels.h"
@ -59,12 +56,6 @@
#include <signal.h>
#endif
#ifdef VERSION
#define APP_VERSION VERSION
#else
#define APP_VERSION "<uknown version>"
#endif
#define MOO_UI_XML_FILE "ui.xml"
#ifdef __WIN32__
#define MOO_ACTIONS_FILE "actions.ini"

2
moo/mooutils/moobigpaned.c
View File

@ -27,10 +27,8 @@
#include <string.h>
#include <stdlib.h>
#ifdef MOO_COMPILATION
#include "mooutils-misc.h"
#include "moocompat.h"
#endif
typedef struct {
GSList *order; /* ids */

55
moo/mooutils/moopane.c
View File

@ -32,65 +32,12 @@
#define SPACING_IN_BUTTON 4
#define OPEN_PANE_TIMEOUT 200
#ifdef MOO_COMPILATION
#include "mooutils-misc.h"
#include "moocompat.h"
#include "moohelp.h"
#include "mooutils-gobject.h"
#include "mooi18n.h"
#else
#define _(s) s
static void
_moo_widget_set_tooltip (GtkWidget *widget,
const char *tip)
{
static GtkTooltips *tooltips;
g_return_if_fail (GTK_IS_WIDGET (widget));
if (!tooltips)
tooltips = gtk_tooltips_new ();
if (GTK_IS_TOOL_ITEM (widget))
gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (widget), tooltips, tip, NULL);
else
gtk_tooltips_set_tip (tooltips, widget, tip, tip);
}
void
_moo_window_set_icon_from_stock (GtkWindow *window,
const char *name)
{
GdkPixbuf *icon;
GtkStockItem dummy;
g_return_if_fail (GTK_IS_WINDOW (window));
g_return_if_fail (name != NULL);
if (gtk_stock_lookup (name, &dummy))
{
icon = gtk_widget_render_icon (GTK_WIDGET (window), name,
GTK_ICON_SIZE_BUTTON, 0);
if (icon)
{
gtk_window_set_icon (GTK_WINDOW (window), icon);
g_object_unref (icon);
}
}
else
{
gtk_window_set_icon_name (GTK_WINDOW (window), name);
}
}
#endif
struct _MooPane {
GtkObject base;
@ -1373,9 +1320,7 @@ create_pane_window (MooPane *pane)
pane->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
window = GTK_WINDOW (pane->window);
#ifdef MOO_COMPILATION
moo_help_connect_keys (pane->window);
#endif
set_pane_window_icon_and_title (pane);
gtk_window_set_type_hint (GTK_WINDOW (pane->window),

3
moo/mooutils/moopaned.c
View File

@ -36,11 +36,8 @@
#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
#ifdef MOO_COMPILATION
# include "mooutils-misc.h"
# include "moocompat.h"
#endif
#define MIN_PANE_SIZE 10