LinGui: use a smaller font in audio settings controls

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

diff --git a/gtk/src/Makefile.am b/gtk/src/Makefile.am
index 71b3ac3..52be4d1 100644 (file)
--- a/gtk/src/Makefile.am
+++ b/gtk/src/Makefile.am
@@ -4,13 +4,13 @@ if MINGW
 HB_LIBS= \
        -lhb -la52 -lmkv -lavformat -lavcodec -lavutil -ldca -ldvdnav -ldvdread \
        -lfaac -lmp3lame -lmpeg2 -lvorbis -lvorbisenc -logg -lsamplerate \
-       -lx264 -lxvidcore -lmp4v2 -lswscale -ltheora -lfaad -lz \
+       -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 -lxvidcore -lmp4v2 -lswscale -ltheora -lfaad -lz \
+       -lx264 -lmp4v2 -lswscale -ltheora -lfaad -lz \
        -lbz2 -lpthread
 endif
 
@@ -68,6 +68,8 @@ ghb_SOURCES = \
        queuehandler.h \
        audiohandler.c \
        audiohandler.h \
+       subtitlehandler.c \
+       subtitlehandler.h \
        x264handler.c \
        x264handler.h \
        main.c \
@@ -125,13 +127,13 @@ widget.deps: 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
 
@@ -147,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 \
@@ -169,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 \