[ekiga] Complete previous commit about renaming file



commit 67e1c5d19fcaa1b187eaaa3c992a105943721bb3
Author: Eugen Dedu <Eugen Dedu pu-pm univ-fcomte fr>
Date:   Mon Dec 23 10:13:12 2013 +0100

    Complete previous commit about renaming file

 HACKING         |    4 ++--
 src/Makefile.am |    6 +-----
 2 files changed, 3 insertions(+), 7 deletions(-)
---
diff --git a/HACKING b/HACKING
index 876c749..010c01d 100644
--- a/HACKING
+++ b/HACKING
@@ -2,9 +2,9 @@ Developers:
 - Please keep the current coding style in Ekiga and put comments.
   Functions descriptions should have 3 fields: DESCRIPTION, BEHAVIOR
   and PRE.  PRE means the set of conditions on the parameters to be
-  sure that the function works.  See src/gui/main.h for an example.
+  sure that the function works.  See src/main.h for an example.
 - Any new file you create must start with the license preamble and the
-  short file description, see src/gui/main.cpp for an example
+  short file description, see src/main.cpp for an example.
 - About gconf: All notifiers and all gconf_client_notify_add must be
   in config.cpp.  The callback that updates the gconf cache must be
   located in the file containing the widget associated to the
diff --git a/src/Makefile.am b/src/Makefile.am
index fddd7f2..9b24f58 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,7 +25,6 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/lib/engine/components/opal      \
        -I$(top_srcdir)/src                             \
        -I$(top_srcdir)/src/dbus-helper/                \
-       -I$(top_srcdir)/src/gui/                        \
        -I$(top_builddir)/src/dbus-helper/
 
 BUILT_SOURCES = src/revision.h
@@ -53,12 +52,9 @@ ekiga_SOURCES =
 
 nodist_ekiga_SOURCES =
 
-# Graphical User Interface
-ekiga_SOURCES +=                       \
-       gui/main.cpp
-
 # Endpoints
 ekiga_SOURCES +=                       \
+       main.cpp                        \
        ekiga.h                         \
        ekiga.cpp
 


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