Fix xstrncpy usage, also fixes etags. From Nelson

[sxemacs] / modules / dbus / Makefile.am

diff --git a/modules/dbus/Makefile.am b/modules/dbus/Makefile.am
index b347fc6..c12954d 100644 (file)
--- a/modules/dbus/Makefile.am
+++ b/modules/dbus/Makefile.am
@@ -47,25 +47,24 @@ abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 headerdir = $(includedir)/$(instvarsepdir)
 
-AM_CFLAGS = $(dll_cflags) -DIMA_MODULE -DUSE_SXEMACS_CONFIG_H
+AM_CFLAGS = $(dll_cflags) -DIMA_MODULE -DUSE_SXEMACS_CONFIG_H \
+       @DBUS_CFLAGS@
 AM_CPPFLAGS = -I$(srcdir) -I$(builddir)  -I$(top_srcdir)/src \
        -I$(top_builddir)/src $(SXEMACS_INCLUDES) $(c_switch_all)
-AM_LDFLAGS = -module $(XCCLDFLAGS)
+AM_LDFLAGS = -module $(XCCLDFLAGS) @DBUS_LIBS@
 
 ## mods
-module_LTLIBRARIES = 
+module_LTLIBRARIES = dbusbind.la
 
-BUILT_SOURCES = dbusbind.c dbusbind.doc.c
+BUILT_SOURCES = dbusbind.doc.c
 
-header_HEADERS =
+header_HEADERS = dbusbind.h
 
-module_LTLIBRARIES += sxe-dbus.la
+dbusbind_la_SOURCES = dbusbind.c
 
-sxe_dbus_la_SOURCES = dbusbind.c
+nodist_dbusbind_la_SOURCES = dbusbind.doc.c
 
-nodist_sxe_dbus_la_SOURCES = dbusbind.doc.c
-
-sxe_dbus_la_CFLAGS = $(AM_CFLAGS) -DEMOD_SXE_DBUS
+dbusbind_la_CFLAGS = $(AM_CFLAGS) -DEMOD_SXE_DBUS
 
 CLEANFILES = $(BUILT_SOURCES) auto-autoloads.el{,c} libsxe-dbus.a
 
@@ -77,7 +76,7 @@ BITCHENV = EMACSPACKAGEPATH= SOURCE_TREE_ROOT=$(abs_top_srcdir) BUILD_TREE_ROOT=
 BATCH = $(BITCHENV) $(BITCH)
 RM = rm -f
 
-# 
+#
 # Help the SXEmacs developers get nice post-processed source files
 
 ## the libtool approach
@@ -92,9 +91,3 @@ SUFFIXES = .doc.c
 ## Create assembler output (debugging purposes only)
 .c.s:
        $(COMPILE) -S -c $(cflags) $<
-
-## all the mods
-module_LTLIBRARIES =
-
-BUILT_SOURCES =
-