• dscho's avatar
    clean up build flags · 3d2eab57
    dscho authored
    The flag handling (both compiler options and include paths) are a mess at
    the moment.  There is no point in forcing "-O2 -g" when these are already
    the defaults, and if someone changes the defaults, chances are good they
    don't want you clobbering their choices.
    
    The -Wall flag should be handled in configure and thrown into CFLAGS once
    rather than every Makefile.am.  Plus, this way we can control which
    compilers the flag actually gets used with.
    
    Finally, the INCLUDES variable is for -I paths, not AM_CFLAGS.  Nor should
    it contain -I. as this is already in the default includes setup.
    Signed-off-by: 's avatarMike Frysinger <vapier@gentoo.org>
    Signed-off-by: 's avatarJohannes Schindelin <johannes.schindelin@gmx.de>
    3d2eab57
Makefile.am 645 Bytes
INCLUDES = -I$(top_srcdir)
LDADD = ../libvncclient/libvncclient.la @WSOCKLIB@

if WITH_FFMPEG
FFMPEG_HOME=@with_ffmpeg@

if HAVE_MP3LAME
MP3LAME_LIB=-lmp3lame
endif

vnc2mpg_CFLAGS=-I$(FFMPEG_HOME)/libavformat -I$(FFMPEG_HOME)/libavcodec -I$(FFMPEG_HOME)/libavutil
vnc2mpg_LDADD=$(LDADD) $(FFMPEG_HOME)/libavformat/libavformat.a $(FFMPEG_HOME)/libavcodec/libavcodec.a $(MP3LAME_LIB) -lm

FFMPEG_CLIENT=vnc2mpg
endif

if HAVE_LIBSDL
SDLVIEWER=SDLvncviewer

SDLvncviewer_CFLAGS=$(SDL_CFLAGS)

# thanks to autoconf, this looks ugly
SDLvncviewer_LDADD=$(LDADD) $(SDL_LIBS)
endif

noinst_PROGRAMS=ppmtest $(SDLVIEWER) $(FFMPEG_CLIENT) backchannel