X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=gtk%2Fsrc%2FMakefile.am;h=52be4d1c26296d434bb2fb4e625dfb061f95bf3f;hb=0884cb45aeeb60a46effe1d1056a61fe68300ea7;hp=8abcc6f9793b3940b58bb3de6347827e3b7c5626;hpb=30d76453a9337737d2d88360dc30103c167adb77;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/gtk/src/Makefile.am b/gtk/src/Makefile.am
index 8abcc6f9..52be4d1c 100644
--- a/gtk/src/Makefile.am
+++ b/gtk/src/Makefile.am
@@ -1,30 +1,18 @@
 ## Process this file with automake to produce Makefile.in
 
-HB_LIBS=\
-	-lhb \
-	-la52 \
-	-lmkv \
-	-lavformat \
-	-lavcodec \
-	-lavutil \
-	-ldca \
-	-ldvdread \
-	-lfaac \
-	-lmp3lame \
-	-lmpeg2 \
-	-lvorbis \
-	-lvorbisenc \
-	-logg \
-	-lsamplerate \
-	-lx264 \
-	-lxvidcore \
-	-lmp4v2 \
-	-lswscale \
-	-ltheora \
-	-lfaad \
-	-lz \
-	-lbz2 \
-	-lpthread
+if MINGW
+HB_LIBS= \
+	-lhb -la52 -lmkv -lavformat -lavcodec -lavutil -ldca -ldvdnav -ldvdread \
+	-lfaac -lmp3lame -lmpeg2 -lvorbis -lvorbisenc -logg -lsamplerate \
+	-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 -lmp4v2 -lswscale -ltheora -lfaad -lz \
+	-lbz2 -lpthread
+endif
 
 icons =	\
 	hb-icon.128.png 
@@ -66,13 +54,9 @@ AM_CPPFLAGS = \
 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
 	$(GHB_CFLAGS)
 
-AM_CFLAGS =\
-	 -Wall\
-	 -g
+AM_CFLAGS = -Wall -g
 
 bin_PROGRAMS = ghb 
-noinst_PROGRAMS = makewidgetdeps quotestring create_resources preset_xlat \
-	resource_data.h resources.plist widget.deps widget_reverse.deps
 
 # Dummy file, not built.  Forces g++ linking
 nodist_EXTRA_ghb_SOURCES = dummy.cpp
@@ -84,6 +68,8 @@ ghb_SOURCES = \
 	queuehandler.h \
 	audiohandler.c \
 	audiohandler.h \
+	subtitlehandler.c \
+	subtitlehandler.h \
 	x264handler.c \
 	x264handler.h \
 	main.c \
@@ -117,65 +103,37 @@ ghb_SOURCES = \
 	marshalers.c \
 	marshalers.h
 
+if MINGW
+ghb_LDFLAGS = \
+	-mwindows -Wl,--export-dynamic -Wl,--exclude-libs,ALL
+else
 ghb_LDFLAGS = \
 	-Wl,--export-dynamic -Wl,--exclude-libs,ALL
+endif
 
 ghb_LDADD = $(HB_LIBS) $(GHB_LIBS)
 
 ghb_DEPENDENCIES = $(HB_DIR)/libhb/libhb.a
 
-makewidgetdeps_SOURCES = \
-	plist.c \
-	plist.h \
-	values.c \
-	values.h \
-	makedeps.c 
-
-makewidgetdeps_LDADD = $(GHBTOOLS_LIBS)
-
-create_resources_SOURCES = \
-	create_resources.c \
-	plist.c \
-	plist.h \
-	values.c \
-	values.h \
-	icon_tools.c \
-	icon_tools.h
-
-create_resources_LDADD = $(GHBTOOLS_LIBS)
-
-preset_xlat_SOURCES = \
-	preset_xlat.c \
-	plist.c \
-	plist.h \
-	values.c \
-	values.h
-
-preset_xlat_LDADD = $(GHBTOOLS_LIBS)
-
-quotestring_SOURCES = quotestring.c
-
-dumbell: preset_xlat
-
 resources.o: resource_data.h
 
 resource_data.h: quotestring resources.plist
 	./quotestring resources.plist resource_data.h
 
-widget_reverse.deps: makewidgetdeps
-widget.deps: makewidgetdeps
-	./makewidgetdeps
+widget_reverse.deps: widgetdeps
+widget.deps: widgetdeps
+	./widgetdeps
 
 resources.plist: create_resources resources.list $(icons_dep) internal_defaults.xml standard_presets.xml ghb.ui widget.deps widget_reverse.deps
 	./create_resources -I$(srcdir) $(srcdir)/resources.list resources.plist
 
-ghbcellrenderertext.c: marshalers.h
+ghbcellrenderertext.$(OBJEXT): 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
 
@@ -191,7 +149,7 @@ uninstall-local:
 		fi; \
 		rm -f $(DESTDIR)/$(datadir)/icons/hicolor/$$SIZE/apps/$$FILE; \
 	done
-	@-if test -n "$(DESTDIR)/$(datadir)"; then \
+	@-if test -z "$(DESTDIR)"; then \
 		echo "Updating Gtk icon cache."; \
 		$(gtk_update_icon_cache); \
 	else \
@@ -213,7 +171,7 @@ install-data-local:
 		mkdir -p $(DESTDIR)/$(datadir)/icons/hicolor/$$SIZE/apps/; \
 		$(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)/$(datadir)/icons/hicolor/$$SIZE/apps/$$FILE; \
 	done
-	@-if test -n "$(DESTDIR)/$(datadir)"; then \
+	@-if test -z "$(DESTDIR)"; then \
 		echo "Updating Gtk icon cache."; \
 		$(gtk_update_icon_cache); \
 	else \