devhelp r1211 - in trunk: . src

[rhult svn gnome org]

Author: rhult
Date: Sat Oct 11 06:42:17 2008
New Revision: 1211
URL: http://svn.gnome.org/viewvc/devhelp?rev=1211&view=rev

Log:
2008-10-11  Richard Hult  <richard imendio com>

	* src/ige-conf-mac.c: Rename from .m to work around a bug(?) in
	auto*, can't get this to work on linux.

	* configure.ac: Remove AC_PROG_OBJC.

	* src/Makefile.am: Update the filename here and use -xobjective-c.


Added:
   trunk/src/ige-conf-mac.c
      - copied unchanged from r1210, /trunk/src/ige-conf-mac.m
Removed:
   trunk/src/ige-conf-mac.m
Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/src/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sat Oct 11 06:42:17 2008
@@ -9,7 +9,6 @@
 
 AC_PROG_CC
 AC_PROG_CPP
-AC_PROG_OBJC
 AM_PROG_CC_C_O
 
 AM_PATH_GLIB_2_0

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Sat Oct 11 06:42:17 2008
@@ -67,13 +67,6 @@
 	ige-conf-private.h				\
 	$(conf_platform_sources)
 
-if HAVE_PLATFORM_OSX
-conf_platform_sources = ige-conf-mac.m
-endif
-if HAVE_PLATFORM_X11
-conf_platform_sources =	ige-conf-gconf.c
-endif
-
 libdevhelp_1_la_CPPFLAGS =				\
 	$(AM_CPPFLAGS)					\
 	$(ZLIB_CPPFLAGS)
@@ -81,9 +74,6 @@
 libdevhelp_1_la_CFLAGS =				\
 	$(LIBDEVHELP_CFLAGS)
 
-libdevhelp_1_la_OBJCFLAGS =				\
-	$(LIBDEVHELP_CFLAGS)
-
 libdevhelp_1_la_LIBADD =				\
 	$(LIBDEVHELP_LIBS)				\
 	$(ZLIB_LIBS)
@@ -91,4 +81,12 @@
 libdevhelp_1_la_LDFLAGS =				\
 	$(ZLIB_LDFLAGS)
 
+if HAVE_PLATFORM_OSX
+conf_platform_sources = ige-conf-mac.c
+libdevhelp_1_la_CPPFLAGS += -xobjective.c
+endif
+if HAVE_PLATFORM_X11
+conf_platform_sources = ige-conf-gconf.c
+endif
+
 MARSHAL=dh