From 7588efaff9fcf2079b5f2a4429862bfa4fb7281d Mon Sep 17 00:00:00 2001 From: drw Date: Tue, 02 Mar 2004 23:29:43 +0000 Subject: Formatter: libopie -> libopie2 --- diff --git a/noncore/tools/formatter/config.in b/noncore/tools/formatter/config.in index 0748213..5758180 100644 --- a/noncore/tools/formatter/config.in +++ b/noncore/tools/formatter/config.in @@ -1,4 +1,4 @@ config FORMATTER boolean "opie-formatter (filesystem formatting and mount app)" default "y" - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE diff --git a/noncore/tools/formatter/formatter.pro b/noncore/tools/formatter/formatter.pro index 6450954..daedad9 100644 --- a/noncore/tools/formatter/formatter.pro +++ b/noncore/tools/formatter/formatter.pro @@ -4,6 +4,6 @@ SOURCES = formatter.cpp inputDialog.cpp output.cpp main.cpp TARGET = formatter INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS += -lqpe +LIBS += -lqpe -lopiecore2 include ( $(OPIEDIR)/include.pro ) diff --git a/noncore/tools/formatter/main.cpp b/noncore/tools/formatter/main.cpp index 6228e55..bdd4a2c 100644 --- a/noncore/tools/formatter/main.cpp +++ b/noncore/tools/formatter/main.cpp @@ -10,10 +10,9 @@ * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * ***************************************************************************/ -#include #include "formatter.h" -#include +#include OPIE_EXPORT_APP( OApplicationFactory ) diff --git a/noncore/tools/formatter/opie-formatter.control b/noncore/tools/formatter/opie-formatter.control index 11fe57a..19ba7c8 100644 --- a/noncore/tools/formatter/opie-formatter.control +++ b/noncore/tools/formatter/opie-formatter.control @@ -4,6 +4,6 @@ Priority: optional Section: opie/settings Maintainer: L.J. Potter Architecture: arm -Depends: task-opie-minimal +Depends: task-opie-minimal, libopiecore2 Description: The filesystem formatting and mountpoint app for the Opie environment. Version: $QPE_VERSION$EXTRAVERSION -- cgit v0.9.0.2