--- np2/x11/Makefile.am	2011/12/24 01:28:19	1.8
+++ np2/x11/Makefile.am	2012/01/29 03:22:24	1.13
@@ -1,5 +1,3 @@
-#	$Id: Makefile.am,v 1.8 2011/12/24 01:28:19 monaka Exp $
-
 real_topsrcdir=	$(top_srcdir)/..
 
 bin_PROGRAMS=	xnp2
@@ -241,10 +239,13 @@ AM_CPPFLAGS=	-I$(real_topsrcdir) \
 		-I$(real_topsrcdir)/vram \
 		$(GTK_CFLAGS) $(SDL_CFLAGS)
 
+if HAVE_GCC
 AM_CFLAGS=	-fsigned-char
+CFLAGS+=	-fno-strict-aliasing
+endif
 
 xnp2_LDADD=	$(GTK_LIBS) $(SDL_LIBS) \
-		$(X_PRE_LIBS) $(X_LIBS) $(X_EXTRA_LIBS)
+		$(X_LIBS) $(X_PRE_LIBS) $(XLIB) $(X_EXTRA_LIBS)
 
 DEFS=		@DEFS@ -DSYSRESPATH=\""$(pkgdatadir)"\"
 
@@ -272,6 +273,7 @@ xnp2_SOURCES+=	$(real_topsrcdir)/i386c/c
 		$(real_topsrcdir)/i386c/ia32/instructions/data_trans.c \
 		$(real_topsrcdir)/i386c/ia32/instructions/dec_arith.c \
 		$(real_topsrcdir)/i386c/ia32/instructions/flag_ctrl.c \
+		$(real_topsrcdir)/i386c/ia32/instructions/fpu.c \
 		$(real_topsrcdir)/i386c/ia32/instructions/logic_arith.c \
 		$(real_topsrcdir)/i386c/ia32/instructions/misc_inst.c \
 		$(real_topsrcdir)/i386c/ia32/instructions/seg_reg.c \
@@ -285,8 +287,6 @@ AM_CPPFLAGS+=	-I$(real_topsrcdir)/i386c 
 		-I$(real_topsrcdir)/i386c/ia32 \
 		-I$(real_topsrcdir)/i386c/ia32/instructions \
 		-I$(real_topsrcdir)/i386c/ia32/instructions/fpu
-
-DEFS+=		-DCPUCORE_IA32
 else
 xnp2_SOURCES+=	$(real_topsrcdir)/i286c/i286c.c \
 		$(real_topsrcdir)/i286c/i286c_mn.c \
@@ -304,6 +304,8 @@ xnp2_SOURCES+=	$(real_topsrcdir)/i286c/i
 AM_CPPFLAGS+=	-I$(real_topsrcdir)/i286c
 endif
 
+CLEANFILES+=	make.log
+
 cleandir:: distclean
 
 .man1.1 .jman1.1j: