3 files changed, 6 insertions, 16 deletions
diff --git a/src/arch/instructions/Makefile.am b/src/arch/instructions/Makefile.am
index 24d3eb5..28cf90f 100644
--- a/src/arch/instructions/Makefile.am
+++ b/src/arch/instructions/Makefile.am
@@ -1,24 +1,14 @@
 
 noinst_LTLIBRARIES = libarchinstructions.la
 
-libarchinstructions_la_SOURCES =		\
-	raw.h raw.c							\
-	undefined-int.h						\
+libarchinstructions_la_SOURCES =			\
+	raw.h raw.c								\
+	undefined-int.h							\
 	undefined.h undefined.c
 
-libarchinstructions_la_LIBADD =	
-
-libarchinstructions_la_LDFLAGS = 
+libarchinstructions_la_CFLAGS = $(TOOLKIT_CFLAGS) $(LIBXML_CFLAGS)
 
 
 devdir = $(includedir)/chrysalide/$(subdir:src/%=core/%)
 
 dev_HEADERS = $(libarchinstructions_la_SOURCES:%c=)
-
-
-AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS)
-
-AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
-
-
-SUBDIRS = 
diff --git a/src/arch/instructions/raw.c b/src/arch/instructions/raw.c
index 6340e46..26282fa 100644
--- a/src/arch/instructions/raw.c
+++ b/src/arch/instructions/raw.c
@@ -35,7 +35,7 @@
 #include "../instruction-int.h"
 #include "../operands/immediate.h"
 #include "../operands/target.h"
-#include "../../gtkext/gtkblockdisplay.h"
+#include "../../core/columns.h"
 
 
 
diff --git a/src/arch/instructions/undefined.c b/src/arch/instructions/undefined.c
index 7ed5db9..15c63e7 100644
--- a/src/arch/instructions/undefined.c
+++ b/src/arch/instructions/undefined.c
@@ -31,7 +31,7 @@
 
 
 #include "undefined-int.h"
-#include "../../gtkext/gtkblockdisplay.h"
+#include "../../core/columns.h"