don't set the theme preview if a null is returned (trying to fix bug #3285)
[dana/obconf.git] / Makefile.am
index 8ad2e74..369ec3d 100644 (file)
@@ -9,7 +9,7 @@ mimedir         = $(datadir)/mime
 mimepkgdir      = $(datadir)/mime/packages
 kdemimedir      = $(datadir)/mimelnk/application
 
-AUTOMAKE_OPTIONS = subdir-objects
+AUTOMAKE_OPTIONS = subdir-objects foreign
 ACLOCAL_AMFLAGS = -I m4
 
 bin_PROGRAMS = \
@@ -38,17 +38,37 @@ src_obconf_LDADD = \
        $(LIBTAR_LIBS)
 src_obconf_SOURCES = \
        src/gettext.h \
+       src/about.c \
+       src/archive.c \
+       src/archive.h \
+       src/windows.c \
+       src/windows.h \
+       src/moveresize.c \
+       src/moveresize.h \
+       src/margins.c \
+       src/margins.h \
+       src/mouse.c \
+       src/mouse.h \
+       src/desktops.c \
+       src/desktops.h \
+       src/dock.h \
+       src/dock.c \
        src/main.c \
        src/main.h \
-       src/handlers.c \
-       src/handlers.h \
+       src/appearance.c \
+       src/appearance.h \
+       src/preview.c \
+       src/preview.h \
+       src/preview_update.c \
+       src/preview_update.h \
        src/theme.c \
        src/theme.h \
        src/tree.c \
        src/tree.h
 
 dist_glade_DATA = \
-       src/obconf.glade
+       src/obconf.glade \
+       pixmaps/video-display.png
 
 dist_noinst_DATA = \
        src/obconf.gladep
@@ -62,9 +82,13 @@ dist_mimepkg_DATA = \
 dist_kdemime_DATA = \
        x-openbox-theme.desktop
 
+dist_pixmap_DATA = \
+       data/obconf.png
+
 EXTRA_DIST = \
        config.rpath \
        README \
+       CHANGELOG \
        COPYING \
        AUTHORS \
        m4/codeset.m4 \
@@ -97,12 +121,15 @@ EXTRA_DIST = \
        m4/wchar_t.m4 \
        m4/wint_t.m4 \
        m4/xsize.m4 \
-       debian/changelog.in \
-       debian/compat \
-       debian/control \
-       debian/menu \
-       debian/rules \
+       data/video-display.svg \
        config.rpath
 
+# Packages need to run these...
+
 install-data-hook:
-       update-mime-database $(mimedir) || true
+#      update-mime-database $(mimedir)
+#      update-desktop-database $(desktopdir)
+
+uninstall-hook:
+#      update-mime-database $(mimedir)
+#      update-desktop-database $(desktopdir)