X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=gtk%2Fsrc%2FMakefile.am;h=52be4d1c26296d434bb2fb4e625dfb061f95bf3f;hb=9460d9624a5cf24126bc39605bc47d43330fcdf4;hp=4ce53a9be8af13d0ab760fc32d1fb4267eb146ab;hpb=2d753a3cbadfb1180feaabc226c2adb9bc5977ef;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/gtk/src/Makefile.am b/gtk/src/Makefile.am
index 4ce53a9b..52be4d1c 100644
--- a/gtk/src/Makefile.am
+++ b/gtk/src/Makefile.am
@@ -1,88 +1,62 @@
 ## Process this file with automake to produce Makefile.in
 
-## Created by Anjuta
-
-#HB_LIBS=$(HB_DIR)/libhb/libhb.a -la52 -lmkv -lavformat -lavcodec -lavutil -ldca -ldvdread -lfaac -lmp3lame -lmpeg2 -lvorbis -lvorbisenc -logg -lsamplerate -lx264 -lxvidcore -lmp4v2 -lswscale -ltheora -lfaad -lz -lbz2 -lpthread
-
-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 
 
 icons_dep =	\
-	hb-activity.32.h \
-	hb-add-queue.32.h \
-	hb-backend.h \
-	hb-canceled.16.h \
-	hb-complete.16.h \
-	hb-drawer.32.h \
-	hb-icon.128.h \
-	hb-icon.64.h \
-	hb-pause.32.h \
-	hb-play.32.h \
-	hb-pref.32.h \
-	hb-queue.32.h \
-	hb-queue-delete.16.h \
-	hb-queue-job.16.h \
-	hb-queue-pass1.16.h \
-	hb-queue-pass2.16.h \
-	hb-queue-subtitle.16.h \
-	hb-remove.32.h \
-	hb-source.32.h \
-	hb-stop.32.h \
-	hb-working0.16.h \
-	hb-working1.16.h \
-	hb-working2.16.h \
-	hb-working3.16.h \
-	hb-working4.16.h \
-	hb-working5.16.h
+	hb-activity.32.png \
+	hb-add-queue.32.png \
+	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 \
+	hb-play.32.png \
+	hb-pref.32.png \
+	hb-queue.32.png \
+	hb-queue-delete.16.png \
+	hb-queue-job.16.png \
+	hb-queue-pass1.16.png \
+	hb-queue-pass2.16.png \
+	hb-queue-subtitle.16.png \
+	hb-remove.32.png \
+	hb-source.32.png \
+	hb-stop.32.png \
+	hb-working0.16.png \
+	hb-working1.16.png \
+	hb-working2.16.png \
+	hb-working3.16.png \
+	hb-working4.16.png \
+	hb-working5.16.png
 
 hb_menu = ghb.desktop
 
-builderdir = $(datadir)/ghb/builder
-builder_DATA = ghb.ui
-
 AM_CPPFLAGS = \
 	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
 	-DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
 	$(GHB_CFLAGS)
 
-AM_CFLAGS =\
-	 -Wall\
-	 -g
+AM_CFLAGS = -Wall -g
 
 bin_PROGRAMS = ghb 
-noinst_PROGRAMS = makewidgetdeps quotestring
-
-BUILT_SOURCES = HandBrakeCLI
-
-HandBrakeCLI: $(HB_DIR)/HandBrakeCLI
-	/bin/cp $< $@
 
 # Dummy file, not built.  Forces g++ linking
 nodist_EXTRA_ghb_SOURCES = dummy.cpp
@@ -90,15 +64,30 @@ nodist_EXTRA_ghb_SOURCES = dummy.cpp
 ghb_SOURCES = \
 	callbacks.c \
 	callbacks.h \
+	queuehandler.c \
+	queuehandler.h \
+	audiohandler.c \
+	audiohandler.h \
+	subtitlehandler.c \
+	subtitlehandler.h \
+	x264handler.c \
+	x264handler.h \
 	main.c \
 	settings.c \
 	settings.h \
+	resources.c \
+	resources.h \
 	presets.c \
 	presets.h \
+	preview.c \
 	icons.c \
 	icons.h \
+	icon_tools.c \
+	icon_tools.h \
 	values.c \
 	values.h \
+	appcast.c \
+	appcast.h \
 	plist.c \
 	plist.h \
 	hb-backend.c \
@@ -107,109 +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,--export-dynamic -Wl,--exclude-libs,ALL
+endif
 
-ghb_LDADD = $(GHB_LIBS) $(HB_LIBS)
+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)
-
-quotestring_SOURCES = preset_to_string.c
-
-callbacks.c: widget_deps.h widget_reverse_deps.h
-
-widget_deps.h: makewidgetdeps quotestring
-	./makewidgetdeps
-	./quotestring widget_deps widget_deps.h
+resources.o: resource_data.h
 
-widget_reverse_deps.h: makewidgetdeps quotestring
-	./makewidgetdeps
-	./quotestring widget_reverse_deps widget_reverse_deps.h
+resource_data.h: quotestring resources.plist
+	./quotestring resources.plist resource_data.h
 
-presets.c: internal_defaults.h standard_presets.h
+widget_reverse.deps: widgetdeps
+widget.deps: widgetdeps
+	./widgetdeps
 
-internal_defaults.h: quotestring internal_defaults.xml
-	./quotestring internal_defaults.xml internal_defaults.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
 
-standard_presets.h: quotestring standard_presets.xml
-	./quotestring standard_presets.xml standard_presets.h
+ghbcellrenderertext.$(OBJEXT): marshalers.h
 
-ghbcellrenderertext.c: marshalers.h
+$(srcdir)/marshalers.h: marshalers.list
+	glib-genmarshal --prefix=ghb_marshal $(srcdir)/marshalers.list --header > $(srcdir)/marshalers.h
 
-marshalers.h: marshalers.list
-	glib-genmarshal --prefix=ghb_marshal marshalers.list --header > marshalers.h
-
-marshalers.c: marshalers.list
-	glib-genmarshal --prefix=ghb_marshal marshalers.list --body > marshalers.c
-
-icons.c: $(icons_dep)
-
-hb-activity.32.h: hb-activity.32.png
-	gdk-pixbuf-csource --raw --name=hb_activity32  $< > $@
-hb-add-queue.32.h: hb-add-queue.32.png 
-	gdk-pixbuf-csource --raw --name=hb_add_queue32  $< > $@
-hb-canceled.16.h: hb-canceled.16.png 
-	gdk-pixbuf-csource --raw --name=hb_canceled16  $< > $@
-hb-complete.16.h: hb-complete.16.png 
-	gdk-pixbuf-csource --raw --name=hb_complete16  $< > $@
-hb-drawer.32.h: hb-drawer.32.png 
-	gdk-pixbuf-csource --raw --name=hb_drawer32  $< > $@
-hb-icon.128.h: hb-icon.128.png 
-	gdk-pixbuf-csource --raw --name=hb_icon128  $< > $@
-hb-icon.64.h: hb-icon.64.png 
-	gdk-pixbuf-csource --raw --name=hb_icon64 $< > $@
-hb-pause.32.h: hb-pause.32.png 
-	gdk-pixbuf-csource --raw --name=hb_pause32  $< > $@
-hb-play.32.h: hb-play.32.png 
-	gdk-pixbuf-csource --raw --name=hb_play32  $< > $@
-hb-pref.32.h: hb-pref.32.png 
-	gdk-pixbuf-csource --raw --name=hb_pref32  $< > $@
-hb-queue.32.h: hb-queue.32.png 
-	gdk-pixbuf-csource --raw --name=hb_queue32  $< > $@
-hb-queue-delete.16.h: hb-queue-delete.16.png 
-	gdk-pixbuf-csource --raw --name=hb_queue_delete16  $< > $@
-hb-queue-job.16.h: hb-queue-job.16.png
-	gdk-pixbuf-csource --raw --name=hb_queue_job16  $< > $@
-hb-queue-pass1.16.h: hb-queue-pass1.16.png
-	gdk-pixbuf-csource --raw --name=hb_queue_pass1  $< > $@
-hb-queue-pass2.16.h: hb-queue-pass2.16.png
-	gdk-pixbuf-csource --raw --name=hb_queue_pass2  $< > $@
-hb-queue-subtitle.16.h: hb-queue-subtitle.16.png
-	gdk-pixbuf-csource --raw --name=hb_queue_subtitle16  $< > $@
-hb-remove.32.h: hb-remove.32.png
-	gdk-pixbuf-csource --raw --name=hb_remove32  $< > $@
-hb-source.32.h: hb-source.32.png
-	gdk-pixbuf-csource --raw --name=hb_source32  $< > $@
-hb-stop.32.h: hb-stop.32.png
-	gdk-pixbuf-csource --raw --name=hb_stop32  $< > $@
-hb-working0.16.h: hb-working0.16.png
-	gdk-pixbuf-csource --raw --name=hb_working0  $< > $@
-hb-working1.16.h: hb-working1.16.png
-	gdk-pixbuf-csource --raw --name=hb_working1  $< > $@
-hb-working2.16.h: hb-working2.16.png
-	gdk-pixbuf-csource --raw --name=hb_working2  $< > $@
-hb-working3.16.h: hb-working3.16.png
-	gdk-pixbuf-csource --raw --name=hb_working3  $< > $@
-hb-working4.16.h: hb-working4.16.png
-	gdk-pixbuf-csource --raw --name=hb_working4  $< > $@
-hb-working5.16.h: hb-working5.16.png
-	gdk-pixbuf-csource --raw --name=hb_working5  $< > $@
-
-EXTRA_DIST = $(builder_DATA) 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
 
@@ -225,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 \
@@ -234,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`; \
@@ -250,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 \