Update Makefile.am

Minor update to Makefile.am to use newer AM_CPPFLAGS syntax.
Merge pull request #39 from maxolasersquad/master

Update Makefile.am
Merge branch 'master' of git://github.com/libretro/snes9x into libretro
win32: only set sampler state for fragment
libretro: use port.h
Remove unnecessary counter
Fix calls to log interface.
Include required headers for types in snapshot.h, display.h
Guard Z_BZIP2ED with #ifdef HAVE_BZIP2 in miniunz.c, unzip.c
Merge pull request #44 from Nebuleon/build-fixes-2

Build fixes, second attempt
Fix reconfiguring the X11 sub-window every draw.
Simplify window recreation.
Fix some compiler warnings.
Fix bug caused by virtual directories.
win32: correctly parse unicode command line arguments
Merge commit 'a47d93f86ae8613095a6bfe2676d3be80bfdc7bc'
libretro: remove missing function from .def file
Add more aspect correction options.
Use overscan height of 239 pixels.
Resize window on status bar visibility.
Round window width.