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

diff --git a/gtk/src/Makefile.am b/gtk/src/Makefile.am
index f55fe947..52be4d1c 100644
--- a/gtk/src/Makefile.am
+++ b/gtk/src/Makefile.am
@@ -1,19 +1,35 @@
 ## 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
+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.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 \
@@ -28,29 +44,19 @@ icons =	\
 	hb-working2.16.png \
 	hb-working3.16.png \
 	hb-working4.16.png \
-	hb-working5.16.png 
+	hb-working5.16.png
 
-hb_data = standard_presets
 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 
-BUILT_SOURCES = HandBrakeCLI
-
-HandBrakeCLI: $(HB_DIR)/HandBrakeCLI
-	/bin/cp $< $@
 
 # Dummy file, not built.  Forces g++ linking
 nodist_EXTRA_ghb_SOURCES = dummy.cpp
@@ -58,24 +64,78 @@ 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 \
 	hb-backend.h \
 	renderer_button.h \
 	renderer_button.c \
+	ghbcellrenderertext.c \
+	ghbcellrenderertext.h \
+    ghbcompositor.c \
+    ghbcompositor.h \
 	ghb-dvd.c \
-	ghb-dvd.h 
+	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
 
-EXTRA_DIST = $(builder_DATA) $(icons) HandBrakeCLI
+resources.o: resource_data.h
+
+resource_data.h: quotestring resources.plist
+	./quotestring resources.plist resource_data.h
+
+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.$(OBJEXT): marshalers.h
+
+$(srcdir)/marshalers.h: marshalers.list
+	glib-genmarshal --prefix=ghb_marshal $(srcdir)/marshalers.list --header > $(srcdir)/marshalers.h
+
+$(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
 
 uninstall-local:
 	for icon in $(icons); do \
@@ -89,16 +149,15 @@ uninstall-local:
 		fi; \
 		rm -f $(DESTDIR)/$(datadir)/icons/hicolor/$$SIZE/apps/$$FILE; \
 	done
-	for file in $(hb_data); do \
-		rm -f $(DESTDIR)/$(datadir)/ghb/$$file; \
-	done
+	@-if test -z "$(DESTDIR)"; then \
+		echo "Updating Gtk icon cache."; \
+		$(gtk_update_icon_cache); \
+	else \
+		echo "*** Icon cache not updated. After install, run this:"; \
+		echo "***   $(gtk_update_icon_cache)"; \
+	fi
 	rm -f $(DESTDIR)/$(datadir)/applications/$(hb_menu)
 
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(DESTDIR)/$(datadir)/icons/hicolor
-
-install-exec-local:
-	$(INSTALL_PROGRAM) $(srcdir)/HandBrakeCLI $(DESTDIR)/$(bindir)/HandBrakeCLI
-
 install-data-local:
 	for icon in $(icons); do \
 		SIZE=`echo $$icon | cut -d. -f2`; \
@@ -112,11 +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
-	for file in $(hb_data); do \
-		mkdir -p $(DESTDIR)/$(datadir)/ghb/; \
-		$(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)/$(datadir)/ghb/$$file; \
-	done
-	@-if test -n "$(DESTDIR)/$(datadir)"; then \
+	@-if test -z "$(DESTDIR)"; then \
 		echo "Updating Gtk icon cache."; \
 		$(gtk_update_icon_cache); \
 	else \