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

diff --git a/gtk/src/Makefile.am b/gtk/src/Makefile.am
index 8edf7608..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=\
-	$(HB_DIR)/libhb/libhb.a \
-	$(HB_DIR)/contrib/lib/liba52.a \
-	$(HB_DIR)/contrib/lib/libmkv.a \
-	$(HB_DIR)/contrib/lib/libavformat.a \
-	$(HB_DIR)/contrib/lib/libavcodec.a \
-	$(HB_DIR)/contrib/lib/libavutil.a \
-	$(HB_DIR)/contrib/lib/libdca.a \
-	$(HB_DIR)/contrib/lib/libdvdread.a \
-	$(HB_DIR)/contrib/lib/libfaac.a \
-	$(HB_DIR)/contrib/lib/libmp3lame.a \
-	$(HB_DIR)/contrib/lib/libmpeg2.a \
-	$(HB_DIR)/contrib/lib/libvorbis.a \
-	$(HB_DIR)/contrib/lib/libvorbisenc.a \
-	$(HB_DIR)/contrib/lib/libogg.a \
-	$(HB_DIR)/contrib/lib/libsamplerate.a \
-	$(HB_DIR)/contrib/lib/libx264.a \
-	$(HB_DIR)/contrib/lib/libxvidcore.a \
-	$(HB_DIR)/contrib/lib/libmp4v2.a \
-	$(HB_DIR)/contrib/lib/libswscale.a \
-	$(HB_DIR)/contrib/lib/libtheora.a \
-	$(HB_DIR)/contrib/lib/libfaad.a \
-	-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 
@@ -35,6 +23,8 @@ icons_dep =	\
 	hb-canceled.16.png \
 	hb-complete.16.png \
 	hb-drawer.32.png \
+	hb-status.32.png \
+	hb-status-empty.32.png \
 	hb-icon.128.png \
 	hb-icon.64.png \
 	hb-pause.32.png \
@@ -64,17 +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
-
-BUILT_SOURCES = HandBrakeCLI
-
-HandBrakeCLI: $(HB_DIR)/HandBrakeCLI
-	/bin/cp $< $@
 
 # Dummy file, not built.  Forces g++ linking
 nodist_EXTRA_ghb_SOURCES = dummy.cpp
@@ -86,6 +68,8 @@ ghb_SOURCES = \
 	queuehandler.h \
 	audiohandler.c \
 	audiohandler.h \
+	subtitlehandler.c \
+	subtitlehandler.h \
 	x264handler.c \
 	x264handler.h \
 	main.c \
@@ -112,71 +96,44 @@ ghb_SOURCES = \
 	renderer_button.c \
 	ghbcellrenderertext.c \
 	ghbcellrenderertext.h \
+    ghbcompositor.c \
+    ghbcompositor.h \
 	ghb-dvd.c \
 	ghb-dvd.h \
 	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.c: resource_data.h
+resources.o: resource_data.h
 
 resource_data.h: quotestring resources.plist
 	./quotestring resources.plist resource_data.h
 
-widget_deps: makewidgetdeps
-	./makewidgetdeps
-
-resources.plist: create_resources resources.list $(icons_dep) internal_defaults.xml standard_presets.xml ghb.ui widget_deps widget_reverse_deps
-	./create_resources resources.list resources.plist
+widget_reverse.deps: widgetdeps
+widget.deps: widgetdeps
+	./widgetdeps
 
-ghbcellrenderertext.c: marshalers.h
+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
 
-marshalers.h: marshalers.list
-	glib-genmarshal --prefix=ghb_marshal marshalers.list --header > marshalers.h
+ghbcellrenderertext.$(OBJEXT): marshalers.h
 
-marshalers.c: marshalers.list
-	glib-genmarshal --prefix=ghb_marshal marshalers.list --body > marshalers.c
+$(srcdir)/marshalers.h: marshalers.list
+	glib-genmarshal --prefix=ghb_marshal $(srcdir)/marshalers.list --header > $(srcdir)/marshalers.h
 
-EXTRA_DIST = HandBrakeCLI
+$(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
 
@@ -192,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 \
@@ -201,9 +158,6 @@ uninstall-local:
 	fi
 	rm -f $(DESTDIR)/$(datadir)/applications/$(hb_menu)
 
-install-exec-local:
-	$(INSTALL_PROGRAM) $(srcdir)/HandBrakeCLI $(DESTDIR)/$(bindir)/HandBrakeCLI
-
 install-data-local:
 	for icon in $(icons); do \
 		SIZE=`echo $$icon | cut -d. -f2`; \
@@ -217,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 \