mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

* Fix all per-conditional/'library' CFLAGS (this fixes all library building).

Browse source 
* Fix 1 cut-and-past-o

Originally committed to SVN as r1884.
This commit is contained in:
Amar Takhar 2008-03-04 04:15:14 +00:00
parent a55e392fc2
commit 7b9af6a159
1 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
aegisub/Makefile.am
View file

@ -1,13 +1,14 @@
AUTOMAKE_OPTIONS = foreign AUTOMAKE_OPTIONS = foreign
SUFFIXES = .c .cpp .rc SUFFIXES = .c .cpp .rc
noinst_LIBRARIES=
SUBDIRS = bitmaps posix SUBDIRS = bitmaps posix
bin_PROGRAMS = aegisub AM_CPPFLAGS = -DAEGISUB -Iposix -include posix/defines.h @WX_CPPFLAGS@
noinst_LIBRARIES=
AM_CPPFLAGS = -DAEGISUB -Iposix -include posix/defines.h @FREETYPE_CFLAGS@ @WX_CPPFLAGS@ bin_PROGRAMS = aegisub
aegisub_LDADD = posix/libposix.a aegisub_LDADD = posix/libposix.a
aegisub_CPPFLAGS = @FREETYPE_CFLAGS@ -DAEGISUB -Iposix -include posix/defines.h @WX_CPPFLAGS@
aegisub_LDFLAGS = @GL_LIBS@ @FREETYPE_LIBS@ @PTHREAD_LIBS@ @WX_LIBS@ aegisub_LDFLAGS = @GL_LIBS@ @FREETYPE_LIBS@ @PTHREAD_LIBS@ @WX_LIBS@
#XXX: fix this so it's generated by configure and put into acconf.h #XXX: fix this so it's generated by configure and put into acconf.h
@ -31,7 +32,7 @@ endif
if HAVE_PULSEAUDIO if HAVE_PULSEAUDIO
noinst_LIBRARIES += libaudio_pulseaudio.a noinst_LIBRARIES += libaudio_pulseaudio.a
libaudio_pulseaudio_a_SOURCES = audio_player_pulse.cpp libaudio_pulseaudio_a_SOURCES = audio_player_pulse.cpp
libaudio_pulseaudio_a_CFLAGS = @LIBPULSE_CFLAGS@ libaudio_pulseaudio_a_CPPFLAGS = @LIBPULSE_CFLAGS@
aegisub_LDFLAGS += @LIBPULSE_LIBS@ aegisub_LDFLAGS += @LIBPULSE_LIBS@
aegisub_LDADD += libaudio_pulseaudio.a aegisub_LDADD += libaudio_pulseaudio.a
endif endif
@ -39,7 +40,7 @@ endif
if HAVE_OPENAL if HAVE_OPENAL
noinst_LIBRARIES += libaudio_openal.a noinst_LIBRARIES += libaudio_openal.a
libaudio_openal_a_SOURCES = audio_player_openal.cpp libaudio_openal_a_SOURCES = audio_player_openal.cpp
libaudio_openal_a_CFLAGS = @OPENAL_CFLAGS@ libaudio_openal_a_CPPFLAGS = @OPENAL_CFLAGS@
aegisub_LDFLAGS += @OPENAL_LIBS@ aegisub_LDFLAGS += @OPENAL_LIBS@
aegisub_LDADD += libaudio_openal.a aegisub_LDADD += libaudio_openal.a
endif endif
@ -47,7 +48,6 @@ endif
if HAVE_FFMPEG if HAVE_FFMPEG
noinst_LIBRARIES += libaudiovideo_ffmpeg.a noinst_LIBRARIES += libaudiovideo_ffmpeg.a
libaudiovideo_ffmpeg_a_SOURCES = audio_provider_lavc.cpp lavc_file.cpp video_provider_lavc.cpp lavc_keyframes.cpp libaudiovideo_ffmpeg_a_SOURCES = audio_provider_lavc.cpp lavc_file.cpp video_provider_lavc.cpp lavc_keyframes.cpp
libaudiovideo_ffmpeg_a_CFLAGS = @AVFORMAT_CFLAGS @AVCODEC_CFLAGS@
aegisub_LDFLAGS += @AVFORMAT_LDFLAGS@ @AVCODEC_LDFLAGS@ @SWSCALE_LDFLAGS@ aegisub_LDFLAGS += @AVFORMAT_LDFLAGS@ @AVCODEC_LDFLAGS@ @SWSCALE_LDFLAGS@
aegisub_LDADD += libaudiovideo_ffmpeg.a aegisub_LDADD += libaudiovideo_ffmpeg.a
endif endif
@ -55,7 +55,7 @@ endif
if HAVE_LIBASS if HAVE_LIBASS
noinst_LIBRARIES += libsubtitle_ass.a noinst_LIBRARIES += libsubtitle_ass.a
libsubtitle_ass_a_SOURCES = subtitles_provider_libass.cpp libsubtitle_ass_a_SOURCES = subtitles_provider_libass.cpp
libsubtitle_ass_a_CFLAGS = @LIBASS_CFLAGS@ libsubtitle_ass_a_CPPFLAGS = @LIBASS_CFLAGS@
aegisub_LDFLAGS += @LIBASS_LIBS@ aegisub_LDFLAGS += @LIBASS_LIBS@
aegisub_LDADD += libsubtitle_ass.a aegisub_LDADD += libsubtitle_ass.a
endif endif
@ -64,13 +64,13 @@ if HAVE_HUNSPELL
noinst_LIBRARIES += libspell_hunspell.a noinst_LIBRARIES += libspell_hunspell.a
libspell_hunspell_a_SOURCES = spellchecker_hunspell.cpp libspell_hunspell_a_SOURCES = spellchecker_hunspell.cpp
aegisub_LDFLAGS += @HUNSPELL_LDFLAGS@ aegisub_LDFLAGS += @HUNSPELL_LDFLAGS@
aegisub_LDADD += aegisub_LDADD += libspell_hunspell.a
endif endif
if HAVE_AUTO4_LUA if HAVE_AUTO4_LUA
noinst_LIBRARIES += libauto4_lua.a noinst_LIBRARIES += libauto4_lua.a
libauto4_lua_a_SOURCES = auto4_lua.cpp auto4_lua_assfile.cpp auto4_lua_dialog.cpp auto4_lua_scriptreader.cpp libauto4_lua_a_SOURCES = auto4_lua.cpp auto4_lua_assfile.cpp auto4_lua_dialog.cpp auto4_lua_scriptreader.cpp
libauto4_lua_a_CFLAGS = @LUA_CPPFLAGS@ libauto4_lua_a_CPPFLAGS = @LUA_CPPFLAGS@
aegisub_LDFLAGS += @LUA_LDFLAGS@ aegisub_LDFLAGS += @LUA_LDFLAGS@
aegisub_LDADD += libauto4_lua.a aegisub_LDADD += libauto4_lua.a
endif endif
@ -78,7 +78,7 @@ endif
if HAVE_AUTO4_PERL if HAVE_AUTO4_PERL
noinst_LIBRARIES += libauto4_perl.a noinst_LIBRARIES += libauto4_perl.a
libauto4_perl_a_SOURCES = auto4_perl.cpp auto4_perl_script.cpp auto4_perl_dialogs.cpp auto4_perl_ass.cpp auto4_perl_console.cpp auto4_perl.h auto4_perl_console.h libauto4_perl_a_SOURCES = auto4_perl.cpp auto4_perl_script.cpp auto4_perl_dialogs.cpp auto4_perl_ass.cpp auto4_perl_console.cpp auto4_perl.h auto4_perl_console.h
libauto4_perl_a_CFLAGS = @PERL_CFLAGS@ libauto4_perl_a_CPPFLAGS = @PERL_CFLAGS@
aegisub_LDFLAGS += @PERL_LDFLAGS@ aegisub_LDFLAGS += @PERL_LDFLAGS@
aegisub_LDADD += libauto4_perl.a aegisub_LDADD += libauto4_perl.a
endif endif
@ -86,7 +86,7 @@ endif
if HAVE_AUTO4_RUBY if HAVE_AUTO4_RUBY
noinst_LIBRARIES += libauto4_ruby.a noinst_LIBRARIES += libauto4_ruby.a
libauto4_ruby_a_SOURCES = auto4_ruby_assfile.cpp auto4_ruby.cpp auto4_ruby_dialog.cpp libauto4_ruby_a_SOURCES = auto4_ruby_assfile.cpp auto4_ruby.cpp auto4_ruby_dialog.cpp
lubauto4_ruby_hunspell_a_CFLAGS = @RUBY_CFLAGS@ libauto4_ruby_a_CPPFLAGS = @RUBY_CFLAGS@
aegisub_LDFLAGS += @RUBY_LDFLAGS@ aegisub_LDFLAGS += @RUBY_LDFLAGS@
aegisub_LDADD += libauto4_ruby.a aegisub_LDADD += libauto4_ruby.a
endif endif
@ -97,9 +97,6 @@ aegisub_LDADD += -L$(srcdir)/../auto3 -laegisub-auto3
endif endif
AUTOMATION = auto4_base.cpp
AUDIO_PLAYER= audio_player.cpp
## These aren't built, but are listed here so 'make dist' can always find all the sources ## These aren't built, but are listed here so 'make dist' can always find all the sources
## This should also list all Win32 specific files ## This should also list all Win32 specific files
@ -138,12 +135,12 @@ EXTRA_aegisub_SOURCES = \
win32/stdint.h win32/stdint.h
aegisub_SOURCES = \ aegisub_SOURCES = \
$(AUDIO_PLAYER) \
$(AUTOMATION) \
$(HUNSPELL) \ $(HUNSPELL) \
$(LIBASS) \ $(LIBASS) \
$(FFMPEG) \ $(FFMPEG) \
$(AUTO3_LUA) \ $(AUTO3_LUA) \
auto4_base.cpp \
audio_player.cpp \
aegisublocale.cpp \ aegisublocale.cpp \
ass_attachment.cpp \ ass_attachment.cpp \
ass_dialogue.cpp \ ass_dialogue.cpp \