np2/x11/Makefile.am - diff

Return to Makefile.am CVS log

Up to [RetroPC.NET] / np2 / x11

Diff for /np2/x11/Makefile.am between versions 1.6 and 1.12

version 1.6, 2011/12/22 15:06:58	version 1.12, 2012/01/24 17:58:08
Line 1	Line 1
# $Id$

real_topsrcdir= $(top_srcdir)/..	real_topsrcdir= $(top_srcdir)/..

bin_PROGRAMS= xnp2	bin_PROGRAMS= xnp2
Line 241 AM_CPPFLAGS= -I$(real_topsrcdir) \	Line 239 AM_CPPFLAGS= -I$(real_topsrcdir) \
-I$(real_topsrcdir)/vram \	-I$(real_topsrcdir)/vram \
$(GTK_CFLAGS) $(SDL_CFLAGS)	$(GTK_CFLAGS) $(SDL_CFLAGS)

	if HAVE_GCC
AM_CFLAGS= -fsigned-char	AM_CFLAGS= -fsigned-char
	CFLAGS+= -fno-strict-aliasing
	endif

xnp2_LDADD= $(GTK_LIBS) $(SDL_LIBS) \	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)"\"	DEFS= @DEFS@ -DSYSRESPATH=\""$(pkgdatadir)"\"

Line 285 AM_CPPFLAGS+= -I$(real_topsrcdir)/i386c	Line 286 AM_CPPFLAGS+= -I$(real_topsrcdir)/i386c
-I$(real_topsrcdir)/i386c/ia32 \	-I$(real_topsrcdir)/i386c/ia32 \
-I$(real_topsrcdir)/i386c/ia32/instructions \	-I$(real_topsrcdir)/i386c/ia32/instructions \
-I$(real_topsrcdir)/i386c/ia32/instructions/fpu	-I$(real_topsrcdir)/i386c/ia32/instructions/fpu

DEFS+= -DCPUCORE_IA32
else	else
xnp2_SOURCES+= $(real_topsrcdir)/i286c/i286c.c \	xnp2_SOURCES+= $(real_topsrcdir)/i286c/i286c.c \
$(real_topsrcdir)/i286c/i286c_mn.c \	$(real_topsrcdir)/i286c/i286c_mn.c \
Line 304 xnp2_SOURCES+= $(real_topsrcdir)/i286c/i	Line 303 xnp2_SOURCES+= $(real_topsrcdir)/i286c/i
AM_CPPFLAGS+= -I$(real_topsrcdir)/i286c	AM_CPPFLAGS+= -I$(real_topsrcdir)/i286c
endif	endif

	CLEANFILES+= make.log

cleandir:: distclean	cleandir:: distclean

.man1.1 .jman1.1j:	.man1.1 .jman1.1j:
sed -e 's;@PKGDATADIR@;${DESTDIR}${pkgdatadir};' < $> > $@	@sed -e 's;@PKGDATADIR@;${DESTDIR}${pkgdatadir};' < $< > $@

RetroPC.NET-CVS <cvs@retropc.net>

Removed from v.1.6
changed lines
	Added in v.1.12