fixed totally broken IF's in makefile.am

fixed dependencies
alexkay · Dec 20, 2012 · 07bf679 · 07bf679
1 parent 32bf50d
commit 07bf679
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 27 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -15,34 +15,37 @@ xmonad_log_applet_LDADD = \
 
 appletdir = $(LIBPANEL_APPLET_DIR)
 if PANEL_XFCE4
-applet_files = xmonad-log-applet.desktop
-$(applet_files): $(applet_files:.desktop=.desktop.in)
-	$(SED) -e "s|\@PLUGIN_DIR\@|$(PLUGIN_DIR)|" $< > $@
+    applet_files = xmonad-log-applet.desktop
+    $(applet_files): $(applet_files:.desktop=.desktop.in)
+	    $(SED) -e "s|\@PLUGIN_DIR\@|$(PLUGIN_DIR)|" $< > $@
 else
     if PANEL_MATE
-    applet_files = org.mate.panel.XmonadLogApplet.panel-applet
-    $(applet_files): $(applet_files:.panel-applet=.panel-applet.in)
-    		$(SED) -e "s|\@PLUGIN_DIR\@|$(PLUGIN_DIR)|" $< > $@
-else
-applet_files = org.gnome.panel.XmonadLogApplet.panel-applet
-$(applet_files): $(applet_files:.panel-applet=.panel-applet.in)
-	$(SED) -e "s|\@PLUGIN_DIR\@|$(PLUGIN_DIR)|" $< > $@
+	applet_files = org.mate.panel.XmonadLogApplet.panel-applet
+	$(applet_files): $(applet_files:.panel-applet=.panel-applet.in)
+		$(SED) -e "s|\@PLUGIN_DIR\@|$(PLUGIN_DIR)|" $< > $@
+    else
+	applet_files = org.gnome.panel.XmonadLogApplet.panel-applet
+	$(applet_files): $(applet_files:.panel-applet=.panel-applet.in)
+		$(SED) -e "s|\@PLUGIN_DIR\@|$(PLUGIN_DIR)|" $< > $@
+    endif
 endif
+
 applet_DATA = $(applet_files)
 
 if !PANEL_XFCE4
-if !PANEL_MATE
-servicedir = $(SESSION_BUS_SERVICES_DIR)
-service_in_files = org.gnome.panel.applet.XmonadLogAppletFactory.service.in
-service_DATA = $(service_in_files:.service.in=.service)
-org.gnome.panel.applet.XmonadLogAppletFactory.service: $(service_in_files)
-	$(SED) -e "s|\@PLUGIN_DIR\@|$(PLUGIN_DIR)|" $< > $@
-else
-    servicedir = $(SESSION_BUS_SERVICES_DIR)
-service_in_files = org.mate.panel.applet.XmonadLogAppletFactory.service.in
-service_DATA = $(service_in_files:.service.in=.service)
-	org.mate.panel.applet.XmonadLogAppletFactory.service: $(service_in_files)
-	$(SED) -e "s|\@PLUGIN_DIR\@|$(PLUGIN_DIR)|" $< > $@
+    if !PANEL_MATE
+	servicedir = $(SESSION_BUS_SERVICES_DIR)
+	service_in_files = org.gnome.panel.applet.XmonadLogAppletFactory.service.in
+	service_DATA = $(service_in_files:.service.in=.service)
+	org.gnome.panel.applet.XmonadLogAppletFactory.service: $(service_in_files)
+		$(SED) -e "s|\@PLUGIN_DIR\@|$(PLUGIN_DIR)|" $< > $@
+    else
+	servicedir = $(SESSION_BUS_SERVICES_DIR)
+	service_in_files = org.mate.panel.applet.XmonadLogAppletFactory.service.in
+	service_DATA = $(service_in_files:.service.in=.service)
+		org.mate.panel.applet.XmonadLogAppletFactory.service: $(service_in_files)
+		$(SED) -e "s|\@PLUGIN_DIR\@|$(PLUGIN_DIR)|" $< > $@
+    endif
 endif
 
 DISTCLEANFILES = \

diff --git a/configure.ac b/configure.ac
@@ -20,7 +20,7 @@ AC_SUBST([SESSION_BUS_SERVICES_DIR])
 
 AC_ARG_WITH(
     [panel],
-    [AS_HELP_STRING([--with-panel], [target gnome2 (default), MATE,  gnome3 or xfce4 panel])],
+    [AS_HELP_STRING([--with-panel], [target gnome2 (default), mate,  gnome3 or xfce4 panel])],
     [panel=$withval],
     [panel=gnome2]
 )
@@ -32,9 +32,9 @@ AS_IF(
         [AC_DEFINE(PANEL_GNOME2, 1, [panel version])]
         ,
     [test "x$panel" = xmate],
-        [PKG_CHECK_MODULES(LIBMATEPANEL, libmatepanelapplet >= 1.4.0)]
-        LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=prefix libmatepanelapplet`/share/mate-panel/applets
-        PLUGIN_DIR=`$PKG_CONFIG --variable=prefix libmatepanelapplet`/libexec
+        [PKG_CHECK_MODULES(LIBMATEPANEL, libmatepanelapplet-3.0 >= 1.4.0)]
+        LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=prefix libmatepanelapplet-3.0`/share/mate-panel/applets
+        PLUGIN_DIR=`$PKG_CONFIG --variable=prefix libmatepanelapplet-3.0`/libexec
         [AC_DEFINE(PANEL_MATE, 1, [panel version])]
         ,
     [test "x$panel" = xgnome3],

diff --git a/main.c b/main.c
@@ -13,6 +13,9 @@
 #include <string.h>
 
 #include <gtk/gtk.h>
+#ifdef PANEL_MATE
+#include <mate-panel-applet.h>
+#endif
 #ifndef PANEL_XFCE4
 #include <panel-applet.h>
 #else
@@ -110,7 +113,7 @@ static void xmonad_log_applet_construct(XfcePanelPlugin *plugin)
 PANEL_APPLET_OUT_PROCESS_FACTORY(
     "XmonadLogAppletFactory",
     PANEL_TYPE_APPLET,
-#ifdef PANEL_GNOME2
+#if defined PANEL_GNOME2 || defined PANEL_MATE
     "XmonadLogApplet",
 #endif
     xmonad_log_applet_factory,