X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=gtk%2Fsrc%2FMakefile.am;h=b0f1e4aa2c6fc7d8ea5abd3c198954c8d8fc9089;hb=44946a6f8be82a70e65ca534541183a26fdb804b;hp=71b3ac3635a4400f81d4bc4b26544dd630ce43cb;hpb=64a48a58d954017539afc5e4f1d5c6201873149e;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/gtk/src/Makefile.am b/gtk/src/Makefile.am
index 71b3ac36..b0f1e4aa 100644
--- a/gtk/src/Makefile.am
+++ b/gtk/src/Makefile.am
@@ -4,13 +4,13 @@ if MINGW
 HB_LIBS= \
 	-lhb -la52 -lmkv -lavformat -lavcodec -lavutil -ldca -ldvdnav -ldvdread \
 	-lfaac -lmp3lame -lmpeg2 -lvorbis -lvorbisenc -logg -lsamplerate \
-	-lx264 -lxvidcore -lmp4v2 -lswscale -ltheora -lfaad -lz \
+	-lx264 -lmp4v2 -lswscale -ltheora -lfaad -lz \
 	-lbz2 -liberty -lpthreadGC2
 else
 HB_LIBS= \
 	-lhb -la52 -lmkv -lavformat -lavcodec -lavutil -ldca -ldvdnav -ldvdread \
 	-lfaac -lmp3lame -lmpeg2 -lvorbis -lvorbisenc -logg -lsamplerate \
-	-lx264 -lxvidcore -lmp4v2 -lswscale -ltheora -lfaad -lz \
+	-lx264 -lmp4v2 -lswscale -ltheora -lfaad -lz \
 	-lbz2 -lpthread
 endif
 
@@ -68,6 +68,8 @@ ghb_SOURCES = \
 	queuehandler.h \
 	audiohandler.c \
 	audiohandler.h \
+	subtitlehandler.c \
+	subtitlehandler.h \
 	x264handler.c \
 	x264handler.h \
 	main.c \
@@ -127,11 +129,11 @@ resources.plist: create_resources resources.list $(icons_dep) internal_defaults.
 
 ghbcellrenderertext.c: marshalers.h
 
-marshalers.h: marshalers.list
-	glib-genmarshal --prefix=ghb_marshal marshalers.list --header > marshalers.h
+$(srcdir)/marshalers.h: marshalers.list
+	glib-genmarshal --prefix=ghb_marshal $(srcdir)/marshalers.list --header > $(srcdir)/marshalers.h
 
-marshalers.c: marshalers.list
-	glib-genmarshal --prefix=ghb_marshal marshalers.list --body > marshalers.c
+$(srcdir)/marshalers.c: marshalers.list
+	glib-genmarshal --prefix=ghb_marshal $(srcdir)/marshalers.list --body > $(srcdir)/marshalers.c
 
 gtk_update_icon_cache = gtk-update-icon-cache -f -t $(DESTDIR)/$(datadir)/icons/hicolor