1 --- nautilus-cd-burner-2.8.5/Makefile.am 2004-10-20 15:52:13.000000000 -0700
2 +++ nautilus-cd-burner-2.8.5.new/Makefile.am 2004-11-15 16:57:16.530130640 -0700
4 CLEANFILES = $(desktop_in_files:.desktop.in=.desktop) \
5 $(schema_DATA) $(CDRECMARSHALFILES)
7 +DISTCLEANFILES = intltool-extract intltool-merge intltool-update
9 modulesconfdir=$(sysconfdir)/gnome-vfs-2.0/modules
10 modulesconf_DATA = mapping-modules.conf
11 modulesdir = $(libdir)/gnome-vfs-2.0/modules
16 +# we set this so that Automake will use different file names when
17 +# compiling, so that the copy of mapping-method.o compiled for
18 +# libmapping.la doesn't conflict with the copy compiled for
19 +# mapping-daemon (the library one should be PIC code).
20 +libmapping_la_CFLAGS =
22 libmapping_la_LDFLAGS = $(module_flags)
23 libmapping_la_LIBADD = $(MAPPING_LIBS)
28 AM_CXXFLAGS = -fno-exceptions -fno-rtti
29 -CXXLD=--tag=CC $(CXX)
31 -# If we don't set it, it doesn't seem to appear in the Makefile at all
32 -# and we can't recursively set it, hence
35 +CXX_LINK_TAG = --tag=CC
37 +CXXLINK = $(LIBTOOL) --mode=link $(CXX_LINK_TAG) $(CXXLD) $(AM_CXXFLAGS) \
38 + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
41 libnautilus_burn_la_LIBADD = $(BURN_LIBS)
42 libnautilus_burnincludedir = $(includedir)/libnautilus-burn/