summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog24
-rw-r--r--plugins/ropgadgets/select.c2
-rw-r--r--src/Makefile.am3
-rwxr-xr-xsrc/analysis/Makefile.am1
-rw-r--r--src/analysis/project.c (renamed from src/project.c)18
-rw-r--r--src/analysis/project.h (renamed from src/project.h)8
-rw-r--r--src/dialogs/shellcode.h2
-rw-r--r--src/editor.c2
-rw-r--r--src/gui/editem.h2
-rw-r--r--src/gui/menus/file.c2
-rw-r--r--src/gui/menus/project.h2
-rw-r--r--src/gui/menus/view.c2
-rw-r--r--src/main.c2
13 files changed, 47 insertions, 23 deletions
diff --git a/ChangeLog b/ChangeLog
index fed6745..81fc42d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,29 @@
15-07-14 Cyrille Bagard <nocbos@gmail.com>
+ * plugins/ropgadgets/select.c:
+ * src/analysis/Makefile.am:
+ Update code.
+
+ * src/analysis/project.c:
+ * src/analysis/project.h:
+ New entries: move the project information into the analysis domain.
+
+ * src/dialogs/shellcode.h:
+ * src/editor.c:
+ * src/gui/editem.h:
+ * src/gui/menus/file.c:
+ * src/gui/menus/project.h:
+ * src/gui/menus/view.c:
+ * src/main.c:
+ * src/Makefile.am:
+ Update code.
+
+ * src/project.c:
+ * src/project.h:
+ Moved entries.
+
+15-07-14 Cyrille Bagard <nocbos@gmail.com>
+
* src/gui/panels/log.c:
* src/gui/panels/log.h:
Give to the log panel its own GLib instance.
diff --git a/plugins/ropgadgets/select.c b/plugins/ropgadgets/select.c
index 2889eb5..66c2add 100644
--- a/plugins/ropgadgets/select.c
+++ b/plugins/ropgadgets/select.c
@@ -35,7 +35,7 @@
#include <i18n.h>
-#include <project.h>
+#include <analysis/project.h>
#include <common/cpp.h>
#include <common/extstr.h>
#include <core/formats.h>
diff --git a/src/Makefile.am b/src/Makefile.am
index 5fcc34f..e82ecfb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -88,8 +88,7 @@ libchrysaplugin_la_LIBADD = \
chrysalide_SOURCES = \
editor.h editor.c \
- main.c \
- project.h project.c
+ main.c
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/intl $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) `pkg-config --cflags gthread-2.0` $(LIBPYTHON_CFLAGS)
diff --git a/src/analysis/Makefile.am b/src/analysis/Makefile.am
index 4842ec4..26f9df6 100755
--- a/src/analysis/Makefile.am
+++ b/src/analysis/Makefile.am
@@ -5,6 +5,7 @@ libanalysis_la_SOURCES = \
binary.h binary.c \
block-int.h \
block.h block.c \
+ project.h project.c \
roptions.h roptions.c \
routine.h routine.c \
type-int.h \
diff --git a/src/project.c b/src/analysis/project.c
index 5786532..7f86b11 100644
--- a/src/project.c
+++ b/src/analysis/project.c
@@ -29,15 +29,15 @@
#include <string.h>
-#include "analysis/binaries/file.h"
-#include "common/xml.h"
-#include "core/params.h"
-#include "glibext/signal.h"
-#include "gtkext/easygtk.h"
-#include "gtkext/gtkblockview.h"
-#include "gtkext/gtkgraphview.h"
-#include "gtkext/gtksourceview.h"
-#include "gui/panels/panel.h"
+#include "binaries/file.h"
+#include "../common/xml.h"
+#include "../core/params.h"
+#include "../glibext/signal.h"
+#include "../gtkext/easygtk.h"
+#include "../gtkext/gtkblockview.h"
+#include "../gtkext/gtkgraphview.h"
+#include "../gtkext/gtksourceview.h"
+#include "../gui/panels/panel.h"
diff --git a/src/project.h b/src/analysis/project.h
index 0f4a8f0..05e7f12 100644
--- a/src/project.h
+++ b/src/analysis/project.h
@@ -21,15 +21,15 @@
*/
-#ifndef _PROJECT_H
-#define _PROJECT_H
+#ifndef _ANALYSIS_PROJECT_H
+#define _ANALYSIS_PROJECT_H
#include <gtk/gtk.h>
-#include "analysis/binary.h"
-#include "gtkext/gtkviewpanel.h"
+#include "binary.h"
+#include "../gtkext/gtkviewpanel.h"
diff --git a/src/dialogs/shellcode.h b/src/dialogs/shellcode.h
index 52313c3..d3bb422 100644
--- a/src/dialogs/shellcode.h
+++ b/src/dialogs/shellcode.h
@@ -25,7 +25,7 @@
#define _DIALOGS_EXPORT_H
-#include "../project.h"
+#include "../analysis/project.h"
diff --git a/src/editor.c b/src/editor.c
index 7e041f4..63b467b 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -28,7 +28,7 @@
#include <i18n.h>
-#include "project.h"
+#include "analysis/project.h"
#include "core/params.h"
#include "gtkext/easygtk.h"
#include "gtkext/gtkdockstation.h"
diff --git a/src/gui/editem.h b/src/gui/editem.h
index 827c752..c716337 100644
--- a/src/gui/editem.h
+++ b/src/gui/editem.h
@@ -29,8 +29,8 @@
#include <glib-object.h>
-#include "../project.h"
#include "../analysis/binary.h"
+#include "../analysis/project.h"
#include "../gtkext/gtkviewpanel.h"
diff --git a/src/gui/menus/file.c b/src/gui/menus/file.c
index e343788..6135f62 100644
--- a/src/gui/menus/file.c
+++ b/src/gui/menus/file.c
@@ -28,7 +28,7 @@
#include <i18n.h>
-#include "../../project.h"
+#include "../../analysis/project.h"
#include "../../gtkext/easygtk.h"
diff --git a/src/gui/menus/project.h b/src/gui/menus/project.h
index 92cede8..641f801 100644
--- a/src/gui/menus/project.h
+++ b/src/gui/menus/project.h
@@ -30,7 +30,7 @@
#include "menubar.h"
-#include "../../project.h"
+#include "../../analysis/project.h"
diff --git a/src/gui/menus/view.c b/src/gui/menus/view.c
index c907bc8..c6299a6 100644
--- a/src/gui/menus/view.c
+++ b/src/gui/menus/view.c
@@ -29,7 +29,7 @@
#include "../editem-int.h"
-#include "../../project.h"
+#include "../../analysis/project.h"
#include "../../gtkext/easygtk.h"
#include "../../gtkext/gtkdockstation.h"
diff --git a/src/main.c b/src/main.c
index ffef584..cae6426 100644
--- a/src/main.c
+++ b/src/main.c
@@ -30,7 +30,7 @@
#include <i18n.h>
#include "editor.h"
-#include "project.h"
+#include "analysis/project.h"
#include "analysis/db/server.h"
#include "core/core.h"
#include "core/params.h"