bump ffmpeg from git-185a155 to git-0b32da9

[handbrake-jp/handbrake-jp-git.git] / gtk / src / Makefile.am

diff --git a/gtk/src/Makefile.am b/gtk/src/Makefile.am
index 6aaa0fd..9c1dbd2 100644 (file)
--- a/gtk/src/Makefile.am
+++ b/gtk/src/Makefile.am
@@ -4,14 +4,14 @@ 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
+       -lx264 -lmp4v2 -lswscale -ltheora -lz \
+       -lbz2 -liberty -lpthreadGC2 -lbluray -lass -lfontconfig -lfreetype
 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
+       -lx264 -lmp4v2 -lswscale -ltheora -lz \
+       -lbz2 -lpthread -lbluray -lass -lfontconfig -lfreetype
 endif
 
 icons =        \
@@ -117,17 +117,30 @@ ghb_DEPENDENCIES = $(HB_DIR)/libhb/libhb.a
 
 resources.o: resource_data.h
 
-resource_data.h: quotestring resources.plist
-       ./quotestring resources.plist resource_data.h
+resource_data.h: resources.plist
+       python $(srcdir)/quotestring.py resources.plist resource_data.h
 
-widget_reverse.deps: widgetdeps
-widget.deps: widgetdeps
-       ./widgetdeps
+widget_reverse.deps: makedeps.py
+widget.deps: makedeps.py
+       python $(srcdir)/makedeps.py
 
 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
+CREATE_RES.c = \
+       create_resources.c \
+       plist.c \
+       values.c 
+
+CREATE_RES.c.o = $(patsubst %.c,%-native.o,$(CREATE_RES.c))
+
+create_resources: $(CREATE_RES.c.o)
+       $(CC_FOR_BUILD) -o $@ $^ $(GHB_TOOLS_LIBS)
+ 
+$(CREATE_RES.c.o): %-native.o: %.c
+       $(CC_FOR_BUILD) $(GHB_TOOLS_CFLAGS) -c -o $@ $<
+
+ghbcellrenderertext.$(OBJEXT): marshalers.h
 
 $(srcdir)/marshalers.h: marshalers.list
        glib-genmarshal --prefix=ghb_marshal $(srcdir)/marshalers.list --header > $(srcdir)/marshalers.h
@@ -149,7 +162,7 @@ uninstall-local:
                fi; \
                rm -f $(DESTDIR)/$(datadir)/icons/hicolor/$$SIZE/apps/$$FILE; \
        done
-       @-if test -d "$(DESTDIR)/$(datadir)"; then \
+       @-if test -z "$(DESTDIR)"; then \
                echo "Updating Gtk icon cache."; \
                $(gtk_update_icon_cache); \
        else \
@@ -171,7 +184,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 -d "$(DESTDIR)/$(datadir)"; then \
+       @-if test -z "$(DESTDIR)"; then \
                echo "Updating Gtk icon cache."; \
                $(gtk_update_icon_cache); \
        else \