--- np2/x11/Makefile.am	2011/12/16 11:55:26	1.3
+++ np2/x11/Makefile.am	2011/12/29 13:42:02	1.11
@@ -1,5 +1,3 @@
-#	$Id: Makefile.am,v 1.3 2011/12/16 11:55:26 monaka Exp $
-
 real_topsrcdir=	$(top_srcdir)/..
 
 bin_PROGRAMS=	xnp2
@@ -241,10 +239,11 @@ AM_CPPFLAGS=	-I$(real_topsrcdir) \
 		-I$(real_topsrcdir)/vram \
 		$(GTK_CFLAGS) $(SDL_CFLAGS)
 
-AM_CFLAGS=	-fsigned-char -fno-strict-aliasing
+AM_CFLAGS=	-fsigned-char
+CFLAGS+=	-fno-strict-aliasing
 
 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)"\"
 
@@ -285,15 +284,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 \
@@ -311,6 +301,9 @@ xnp2_SOURCES+=	$(real_topsrcdir)/i286c/i
 AM_CPPFLAGS+=	-I$(real_topsrcdir)/i286c
 endif
 
-.man.1 .jman.1j:
-	sed -e 's;/usr/X11R6/lib/X11/xnp2;${DESTDIR}${pkgdatadir};' \
-	    < $< > $@
+CLEANFILES+=	make.log
+
+cleandir:: distclean
+
+.man1.1 .jman1.1j:
+	@sed -e 's;@PKGDATADIR@;${DESTDIR}${pkgdatadir};' < $< > $@