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

version 1.6, 2011/12/22 15:06:58 version 1.13, 2012/01/29 03:22:24
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 272  xnp2_SOURCES+= $(real_topsrcdir)/i386c/c Line 273  xnp2_SOURCES+= $(real_topsrcdir)/i386c/c
                 $(real_topsrcdir)/i386c/ia32/instructions/data_trans.c \                  $(real_topsrcdir)/i386c/ia32/instructions/data_trans.c \
                 $(real_topsrcdir)/i386c/ia32/instructions/dec_arith.c \                  $(real_topsrcdir)/i386c/ia32/instructions/dec_arith.c \
                 $(real_topsrcdir)/i386c/ia32/instructions/flag_ctrl.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/logic_arith.c \
                 $(real_topsrcdir)/i386c/ia32/instructions/misc_inst.c \                  $(real_topsrcdir)/i386c/ia32/instructions/misc_inst.c \
                 $(real_topsrcdir)/i386c/ia32/instructions/seg_reg.c \                  $(real_topsrcdir)/i386c/ia32/instructions/seg_reg.c \
Line 285  AM_CPPFLAGS+= -I$(real_topsrcdir)/i386c  Line 287  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 304  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};' < $< > $@

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


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