Changeset 129 in MondoRescue for trunk/mondo/mondo

Timestamp:

Nov 22, 2005, 1:04:31 AM (18 years ago)

Author:

bcornec

Message:

Removal of the code related to Xmondo/X11/KDE

Location:

trunk/mondo/mondo

Files:

• Makefile.am (modified) (1 diff)
• common/Makefile.am (modified) (2 diffs)
• common/X-specific.cpp (deleted)
• common/X-specific.h (deleted)
• xmondo (deleted)

trunk/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@ docs restore-scripts
-DIST_SUBDIRS   = common mondoarchive mondorestore xmondo docs restore-scripts
+SUBDIRS        = common mondoarchive mondorestore docs restore-scripts
 
 pkgdata_DATA   = do-not-compress-these

trunk/mondo/mondo/common/Makefile.am

@@ -14 +14 @@
                        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
+                       newt-specific.h
 
 ## Libraries
-if XWIN
- XMONDOLIB           = libXmondo.la
-endif XWIN
-lib_LTLIBRARIES      = libmondo.la libmondo-newt.la $(XMONDOLIB)
+lib_LTLIBRARIES      = libmondo.la libmondo-newt.la
 
 ## libmondo
@@ -35 +32 @@
 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@