Changeset 1054 in MondoRescue for branches/stable/mondo/src

Timestamp:

Jan 16, 2007, 2:50:12 AM (17 years ago)

Author:

Bruno Cornec

Message:

• Backporting more trunk content into stable
• Adding the test and lib directories
• Preparing for l10n

Location:

branches/stable/mondo/src

Files:

• Makefile.am (modified) (1 diff)
• common/Makefile.am (modified) (3 diffs)
• common/mr_string.c (deleted)
• common/mr_string.h (deleted)
• include (added)
• include/mr_conf.h (added)
• include/mr_err.h (added)
• include/mr_gettext.h (added)
• include/mr_mem.h (added)
• include/mr_msg.h (added)
• include/mr_str.h (added)
• include/my-stuff.h (added)
• lib (added)
• lib/Makefile.am (added)
• lib/mr_conf.c (added)
• lib/mr_err.c (added)
• lib/mr_mem.c (added)
• lib/mr_msg.c (added)
• lib/mr_str.c (added)
• mondoarchive/Makefile.am (modified) (2 diffs)
• mondorestore/Makefile.am (modified) (2 diffs)
• test (added)
• test/mktest (added)
• test/mondo.conf (added)
• test/test-conf.c (added)
• test/test-conf.res (added)
• test/test-string.c (added)
• test/test-string.res (added)

branches/stable/mondo/src/Makefile.am

@@ -1 @@
-SUBDIRS        = common mondoarchive mondorestore restore-scripts post-nuke.sample
+SUBDIRS        = lib common mondoarchive mondorestore restore-scripts post-nuke.sample
 DIST_SUBDIRS   = ${SUBDIRS}
 

branches/stable/mondo/src/common/Makefile.am

@@ +1 @@
+##
+## $Id$
 ##
 ## Process this file with Automake to generate `Makefile.in'
 ##
-AM_CPPFLAGS = -DMONDO_SHARE=\"$(pkgdatadir)\"
+AM_CPPFLAGS = -DMONDO_SHARE=\"$(pkgdatadir)\" -DMONDO_CONF_DIR=\"$(sysconfdir)\" -I${top_builddir}/src/include
 
 ## libmondo
@@ -8 +10 @@
 
 libmondo_a_SOURCES  = libmondo-archive.c libmondo-devices.c libmondo-fifo.c \
+                      libmondo-msg.c \
                        libmondo-filelist.c libmondo-files.c libmondo-fork.c \
                        libmondo-mountlist.c libmondo-raid.c \
@@ -24 +27 @@
                        libmondo-string-EXT.h libmondo-tools-EXT.h \
                        libmondo-verify-EXT.h  libmondo-stream-EXT.h \
-                       newt-specific.h \
-                       mr_string.c mr_string.h
+                       newt-specific.h

branches/stable/mondo/src/mondoarchive/Makefile.am

@@ +1 @@
+##
+## $Id$
 ##
 ## Process with Automake to generate Makefile.in
 ##
+AM_CPPFLAGS = -DMONDO_CONF_DIR=\"$(sysconfdir)\" -I${top_builddir}/src/include
 
 ## Headers
@@ -9 +12 @@
 sbin_PROGRAMS        = mondoarchive
 mondoarchive_SOURCES = main.c mondo-cli.c
-mondoarchive_LDADD   = ${top_builddir}/src/common/libmondo.a
+mondoarchive_LDADD   = ${top_builddir}/src/common/libmondo.a ${top_builddir}/src/lib/libmr.a

branches/stable/mondo/src/mondorestore/Makefile.am

@@ +1 @@
+##
+## $Id$
 ##
 ## Process with Automake to generate Makefile.in
 ##
+AM_CPPFLAGS = -DMONDO_CONF_DIR=\"$(sysconfdir)\" -I${top_builddir}/src/include
 
 ## Headers
@@ -12 +15 @@
 mondorestore_SOURCES  = mondo-prep.c mondo-restore.c mondo-rstr-newt.c \
                         mondo-rstr-compare.c mondo-rstr-tools.c
-mondorestore_LDADD    = ${top_builddir}/src/common/libmondo.a @MONDORESTORE_STATIC@
+mondorestore_LDADD    = ${top_builddir}/src/common/libmondo.a ${top_builddir}/src/lib/libmr.a @MONDORESTORE_STATIC@