[Xfce4-commits] r30234 - libxfce4ui/trunk/libxfce4smclient-private

[Nick Schermer]

Author: nick
Date: 2009-07-09 21:07:23 +0000 (Thu, 09 Jul 2009)
New Revision: 30234

Modified:
   libxfce4ui/trunk/libxfce4smclient-private/Makefile.am
Log:
Fix some weirdes in the makefile.


Modified: libxfce4ui/trunk/libxfce4smclient-private/Makefile.am
===================================================================
--- libxfce4ui/trunk/libxfce4smclient-private/Makefile.am	2009-07-09 20:24:06 UTC (rev 30233)
+++ libxfce4ui/trunk/libxfce4smclient-private/Makefile.am	2009-07-09 21:07:23 UTC (rev 30234)
@@ -12,15 +12,15 @@
 	$(PLATFORM_CPPFLAGS)
 
 if PLATFORM_OSX
-platform_sources = eggsmclient-osx.c
-platform_defines = -xobjective-c
-platform_ldflags = -framework Carbon
+smclient_sources = eggsmclient-osx.c
+smclient_defines = -xobjective-c
+smclient_ldflags = -framework Carbon
 else
-platform_sources = \
+smclient_sources = \
 	eggsmclient-xsmp.c \
 	eggdesktopfile.c \
 	eggdesktopfile.h
-platform_libs = -lSM -lICE
+smclient_libs = -lSM -lICE
 endif
 
 lib_LTLIBRARIES = libxfce4smclient-private-1.la
@@ -38,13 +38,13 @@
 	$(libxfce4kbd_headers) \
 	eggsmclient.c \
 	eggsmclient-private.h \
-	$(platform_sources)
+	$(smclient_sources)
 
 libxfce4smclient_private_1_la_CFLAGS = \
-	$(PLATFORM_CFLAGS) \
 	$(GLIB_CFLAGS)  \
 	$(GTK_CFLAGS) \
-	$(LIBX11_CFLAGS)
+	$(LIBX11_CFLAGS) \
+	$(PLATFORM_CFLAGS)
 
 libxfce4smclient_private_1_la_LDFLAGS = \
 	-export-dynamic \
@@ -52,14 +52,14 @@
 	-export-symbols-regex "^[^_].*" \
 	-no-undefined \
 	$(LIBX11_LDFLAGS) \
-	$(platform_ldflags)
+	$(smclient_ldflags) \
+	$(PLATFORM_LDFLAGS)
 
 libxfce4smclient_private_1_la_LIBADD = \
-	$(PLATFORM_LDFLAGS) \
 	$(GLIB_LIBS) \
 	$(GTK_LIBS) \
 	$(LIBX11_LIBS) \
-	$(platform_libs)
+	$(smclient_libs)
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libxfce4smclient-private-1.pc