--- np2/x11/Makefile.am	2011/12/16 10:32:08	1.1
+++ np2/x11/Makefile.am	2012/01/29 03:22:24	1.13
@@ -1,13 +1,12 @@
-#	$Id: Makefile.am,v 1.1 2011/12/16 10:32:08 monaka Exp $
-
 real_topsrcdir=	$(top_srcdir)/..
 
 bin_PROGRAMS=	xnp2
 
-nodist_man1_MANS=	xnp2.1
+nodist_man1_MANS=	xnp2.1 xnp2.1j
+CLEANFILES=		$(nodist_man1_MANS)
 dist_pkgdata_DATA=	$(real_topsrcdir)/x11/resources/fddseek.wav \
 			$(real_topsrcdir)/x11/resources/fddseek1.wav
-#dist_pkgdata_DATA+=	$(real_topsrcdir)/np2tool/np2tool.d88
+dist_pkgdata_DATA+=	$(real_topsrcdir)/np2tool/np2tool.d88
 
 xnp2_SOURCES=	$(real_topsrcdir)/x11/main.c \
 		$(real_topsrcdir)/x11/np2.c \
@@ -240,10 +239,13 @@ AM_CPPFLAGS=	-I$(real_topsrcdir) \
 		-I$(real_topsrcdir)/vram \
 		$(GTK_CFLAGS) $(SDL_CFLAGS)
 
-AM_CFLAGS=	-fsigned-char -fno-strict-aliasing
+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)"\"
 
@@ -271,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 \
@@ -284,15 +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
-##DEFS+=	-DUSE_FPU
-##DEFS+=	-DSUPPORT_MEMDBG32
-##DEFS+=	-DIA32_PROFILE_TLB
-##DEFS+=	-DIA32_INSTRUCTION_TRACE
-##DEFS+=	-DIA32_CROSS_CHECK
-##DEFS+=	-DIA32_REBOOT_ON_PANIC
-##DEFS+=	-DMORE_DEBUG
 else
 xnp2_SOURCES+=	$(real_topsrcdir)/i286c/i286c.c \
 		$(real_topsrcdir)/i286c/i286c_mn.c \
@@ -309,3 +303,10 @@ xnp2_SOURCES+=	$(real_topsrcdir)/i286c/i
 
 AM_CPPFLAGS+=	-I$(real_topsrcdir)/i286c
 endif
+
+CLEANFILES+=	make.log
+
+cleandir:: distclean
+
+.man1.1 .jman1.1j:
+	@sed -e 's;@PKGDATADIR@;${DESTDIR}${pkgdatadir};' < $< > $@