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

version 1.1, 2011/12/16 10:32:08 version 1.6, 2011/12/22 15:06:58
Line 4  real_topsrcdir= $(top_srcdir)/.. Line 4  real_topsrcdir= $(top_srcdir)/..
   
 bin_PROGRAMS=   xnp2  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 \  dist_pkgdata_DATA=      $(real_topsrcdir)/x11/resources/fddseek.wav \
                         $(real_topsrcdir)/x11/resources/fddseek1.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 \  xnp2_SOURCES=   $(real_topsrcdir)/x11/main.c \
                 $(real_topsrcdir)/x11/np2.c \                  $(real_topsrcdir)/x11/np2.c \
Line 240  AM_CPPFLAGS= -I$(real_topsrcdir) \ Line 241  AM_CPPFLAGS= -I$(real_topsrcdir) \
                 -I$(real_topsrcdir)/vram \                  -I$(real_topsrcdir)/vram \
                 $(GTK_CFLAGS) $(SDL_CFLAGS)                  $(GTK_CFLAGS) $(SDL_CFLAGS)
   
 AM_CFLAGS=      -fsigned-char -fno-strict-aliasing  AM_CFLAGS=      -fsigned-char
   
 xnp2_LDADD=     $(GTK_LIBS) $(SDL_LIBS) \  xnp2_LDADD=     $(GTK_LIBS) $(SDL_LIBS) \
                 $(X_PRE_LIBS) $(X_LIBS) $(X_EXTRA_LIBS)                  $(X_PRE_LIBS) $(X_LIBS) $(X_EXTRA_LIBS)
Line 286  AM_CPPFLAGS+= -I$(real_topsrcdir)/i386c  Line 287  AM_CPPFLAGS+= -I$(real_topsrcdir)/i386c 
                 -I$(real_topsrcdir)/i386c/ia32/instructions/fpu                  -I$(real_topsrcdir)/i386c/ia32/instructions/fpu
   
 DEFS+=          -DCPUCORE_IA32  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  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 309  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
   
   cleandir:: distclean
   
   .man1.1 .jman1.1j:
           sed -e 's;@PKGDATADIR@;${DESTDIR}${pkgdatadir};' < $> > $@

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


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