Little fixes for autogen.sh and makefiles to support automake 1.12 and fix bug #35317...
authorHong Jen Yee (PCMan) <pcman.tw@gmail.com>
Sun, 10 Jun 2012 09:39:31 +0000 (17:39 +0800)
committerHong Jen Yee (PCMan) <pcman.tw@gmail.com>
Sun, 10 Jun 2012 09:39:31 +0000 (17:39 +0800)
autogen.sh
data/Makefile.am
src/Makefile.am

index 56a2d3e..0e68dc6 100755 (executable)
@@ -4,10 +4,12 @@ AC_VERSION=
 AUTOMAKE=${AUTOMAKE:-automake}
 AM_INSTALLED_VERSION=$($AUTOMAKE --version | sed -e '2,$ d' -e 's/.* \([0-9]*\.[0-9]*\).*/\1/')
 
+# FIXME: we need a better way for version check later.
 if [ "$AM_INSTALLED_VERSION" != "1.10" \
-    -a "$AM_INSTALLED_VERSION" != "1.11" ];then
+    -a "$AM_INSTALLED_VERSION" != "1.11" \
+    -a "$AM_INSTALLED_VERSION" != "1.12" ];then
        echo
-       echo "You must have automake > 1.10 or 1.11 installed to compile gpicview."
+       echo "You must have automake > 1.10 or 1.11 installed."
        echo "Install the appropriate package for your distribution,"
        echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/"
        exit 1
index 2896fee..1a36d87 100644 (file)
@@ -5,6 +5,7 @@ SUBDIRS=ui
 desktopdir=$(datadir)/applications
 desktop_in_files= \
        pcmanfm.desktop.in \
+       pcmanfm-desktop-pref.desktop.in \
        $(NULL)
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
@@ -18,4 +19,3 @@ EXTRA_DIST= \
        $(desktop_DATA) \
        $(defconf_DATA) \
        $(NULL)
-
index 140a1e7..623c0af 100644 (file)
@@ -8,16 +8,25 @@ AM_CPPFLAGS = \
 bin_PROGRAMS = pcmanfm
 
 pcmanfm_SOURCES = \
-       pcmanfm.c pcmanfm.h \
-       app-config.c app-config.h \
-       main-win.c main-win.h \
-       tab-page.c tab-page.h \
-       desktop.c desktop.h \
-       volume-manager.c volume-manager.h \
-       pref.c pref.h \
-       utils.c utils.h \
+       pcmanfm.c \
+       pcmanfm.h \
+       app-config.c \
+       app-config.h \
+       main-win.c \
+       main-win.h \
+       tab-page.c \
+       tab-page.h \
+       desktop.c \
+       desktop.h \
+       volume-manager.c \
+       volume-manager.h \
+       pref.c \
+       pref.h \
+       utils.c \
+       utils.h \
        gseal-gtk-compat.h \
-       single-inst.c single-inst.h \
+       single-inst.c \
+       single-inst.h \
        $(NULL)
 
 EXTRA_DIST= \