Changeset 423 in MondoRescue for branches/stable/mondo/mondo

Timestamp:

Feb 21, 2006, 6:27:48 PM (18 years ago)

Author:

bcornec

Message:

• .spec files adapted to make rpmlint happy
• no more dyn. libs in mondo
• no more the X11 part in mondo

Location:

branches/stable/mondo/mondo

Files:

• Makefile.am (modified) (1 diff)
• common/Makefile.am (modified) (2 diffs)
• mondoarchive/Makefile.am (modified) (1 diff)
• mondorestore/Makefile.am (modified) (1 diff)
• xmondo (deleted)

branches/stable/mondo/mondo/Makefile.am

@@ -1 @@
-# Note that configure will define @XMONDO@ to be "xmondo" if X support
-# is enabled, "" if not
-SUBDIRS        = common mondoarchive mondorestore @XMONDO@ restore-scripts post-nuke.sample
-DIST_SUBDIRS   = common mondoarchive mondorestore xmondo restore-scripts post-nuke.sample
+SUBDIRS        = common mondoarchive mondorestore restore-scripts post-nuke.sample
+DIST_SUBDIRS   = ${SUBDIRS}
 
 pkglib_DATA   = do-not-compress-these autorun

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

@@ -2 +2 @@
 ## Process this file with Automake to generate `Makefile.in'
 ##
+AM_CPPFLAGS = -DMONDO_LIB=\"$(pkglibdir)\"
 
-AM_CPPFLAGS = -DMONDO_LIB=\"$(pkglibdir)\"
-## Headers
+## libmondo
+noinst_LIBRARIES = libmondo.a
 
-noinst_HEADERS       = libmondo-archive.h libmondo-devices.h \
+libmondo_a_SOURCES  = libmondo-archive.c libmondo-devices.c libmondo-fifo.c \
+                       libmondo-filelist.c libmondo-files.c libmondo-fork.c \
+                       libmondo-mountlist.c libmondo-raid.c \
+                       libmondo-stream.c libmondo-string.c libmondo-tools.c \
+                       libmondo-verify.c newt-specific.c \
+                       libmondo-archive.h libmondo-devices.h \
                        libmondo-filelist.h libmondo-files.h libmondo-fork.h \
                        libmondo-gui.h libmondo-mountlist.h libmondo-raid.h \
@@ -12 +18 @@
                        libmondo-verify.h libmondo-fifo.h \
                        libmondo-archive-EXT.h my-stuff.h mondostructures.h \
-                       libmondo-devices-EXT.h libmondo-fifo-EXT.h libmondo-filelist-EXT.h \
-                       libmondo-files-EXT.h libmondo-fork-EXT.h libmondo-gui-EXT.h \
-                       libmondo-mountlist-EXT.h libmondo-raid-EXT.h libmondo-stream-EXT.h \
-                       libmondo-string-EXT.h libmondo-tools-EXT.h libmondo-verify-EXT.h \
-                       X-specific.h newt-specific.h
-
-## Libraries
-if XWIN
- XMONDOLIB           = libXmondo.la
-endif XWIN
-lib_LTLIBRARIES      = libmondo.la libmondo-newt.la $(XMONDOLIB)
-
-## libmondo
-libmondo_la_SOURCES  = libmondo-archive.c libmondo-devices.c libmondo-fifo.c \
-                       libmondo-filelist.c libmondo-files.c libmondo-fork.c \
-                       libmondo-mountlist.c libmondo-raid.c \
-                       libmondo-stream.c libmondo-string.c libmondo-tools.c \
-                       libmondo-verify.c
-libmondo_la_LDFLAGS  = -version-info 2:3:0 -shrext .so
-libmondo_la_LIBADD   = @LIBS@
-
-## libmondo-newt
-libmondo_newt_la_SOURCES = newt-specific.c
-libmondo_newt_la_LDFLAGS = -version-info 1:0:0 -shrext .so
-libmondo_newt_la_LIBADD  = -lnewt
-
-## libXmondo
-libXmondo_la_SOURCES = libmondo-archive.c libmondo-devices.c libmondo-fifo.c \
-                       libmondo-filelist.c libmondo-files.c libmondo-fork.c \
-                       X-specific.cpp libmondo-mountlist.c libmondo-raid.c \
-                       libmondo-stream.c libmondo-string.c libmondo-tools.c \
-                       libmondo-verify.c 
-libXmondo_la_LDFLAGS = -version-info 1:0:0 -shrext .so
-libXmondo_la_LIBADD  = -L/usr/X11R6/lib -L/usr/local/lib @QT_LIBRARY@ @LIBS@ @my_qt_libraries@ @my_kde_libraries@
-libXmondo_la_CFLAGS  = -D_XWIN
-libXmondo_la_CXXFLAGS= -D_XWIN @my_qt_includes@ @my_kde_includes@
+                       libmondo-devices-EXT.h libmondo-fifo-EXT.h \
+                       libmondo-files-EXT.h libmondo-fork-EXT.h \
+                       libmondo-gui-EXT.h libmondo-filelist-EXT.h \
+                       libmondo-mountlist-EXT.h libmondo-raid-EXT.h  \
+                       libmondo-string-EXT.h libmondo-tools-EXT.h \
+                       libmondo-verify-EXT.h  libmondo-stream-EXT.h \
+                       newt-specific.h

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

@@ -9 +9 @@
 sbin_PROGRAMS        = mondoarchive
 mondoarchive_SOURCES = main.c mondo-cli.c
-mondoarchive_LDADD   = ../common/libmondo.la ../common/libmondo-newt.la
-
-### Man page
-#man1_MANS            = mondoarchive.1
+mondoarchive_LDADD   = ${top_builddir}/mondo/common/libmondo.a

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

@@ -12 +12 @@
 mondorestore_SOURCES  = mondo-prep.c mondo-restore.c mondo-rstr-newt.c \
                         mondo-rstr-compare.c mondo-rstr-tools.c
-mondorestore_LDADD    = ../common/libmondo.la ../common/libmondo-newt.la @MONDORESTORE_STATIC@
+mondorestore_LDADD    = ${top_builddir}/mondo/common/libmondo.a @MONDORESTORE_STATIC@