[dasher: 203/217] Fixes the problems prevents building on Linux.



commit 1661548eb94d2b3bc8329a1c9505325f204fd3ad
Author: Cagdas <cagdasgerede users noreply github com>
Date:   Sat Feb 6 23:04:59 2016 +0200

    Fixes the problems prevents building on Linux.

 Src/Gtk2/dasher_main.cpp |    1 -
 configure.ac             |    6 +-----
 po/POTFILES.in           |    1 -
 3 files changed, 1 insertions(+), 7 deletions(-)
---
diff --git a/Src/Gtk2/dasher_main.cpp b/Src/Gtk2/dasher_main.cpp
index 56d3cb4..ea1a161 100644
--- a/Src/Gtk2/dasher_main.cpp
+++ b/Src/Gtk2/dasher_main.cpp
@@ -714,7 +714,6 @@ dasher_main_load_state(DasherMain *pSelf) {
   int iEditSize = pPrivate->pAppSettings->GetLong(APP_LP_EDIT_SIZE);
   int iWindowWidth = pPrivate->pAppSettings->GetLong(APP_LP_SCREEN_WIDTH);
   int iWindowHeight = pPrivate->pAppSettings->GetLong(APP_LP_SCREEN_HEIGHT);
-}
 
 #ifndef WITH_MAEMO
   gtk_window_resize(GTK_WINDOW(pPrivate->pMainWindow), iWindowWidth, iWindowHeight);
diff --git a/configure.ac b/configure.ac
index 0dd6aff..1521b32 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@ AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_LIBOBJ_DIR([Src/Common])
 
-AM_INIT_AUTOMAKE([1.8 gnu check-news dist-bzip2])
+AM_INIT_AUTOMAKE([1.8 gnu check-news dist-bzip2 subdir-objects])
 AM_MAINTAINER_MODE
 
 AC_PROG_MAKE_SET
@@ -462,10 +462,6 @@ AC_CONFIG_FILES([Data/dasher.desktop.in
                 Src/DasherCore/LanguageModelling/Makefile
                 Src/DasherIM/Makefile
                 Src/Gtk2/Makefile
-                Src/Installer/Makefile
-                Src/InstallerTobii/Makefile
-                Src/InstallerW2K/Makefile
-                Src/Win32/Makefile
                 po/Makefile.in
 ])
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index a729dd5..c434066 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -42,7 +42,6 @@ Src/DasherCore/TwoPushDynamicFilter.cpp
 Src/Gtk2/DasherAppSettings.cpp
 Src/Gtk2/dasher_editor.cpp
 Src/Gtk2/dasher_main.cpp
-Src/Gtk2/GnomeSpeech.cpp
 Src/Gtk2/module_settings_window.cpp
 Src/Gtk2/mouse_input.h
 Src/Gtk2/Preferences.cpp


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