- no need to check in Makefiles

- no need to link against libopie

3 files changed, 4 insertions, 162 deletions

diff --git a/core/symlinker/Makefile b/core/symlinker/Makefile
deleted file mode 100644
index f35292c..0000000
--- a/core/symlinker/Makefile
+++ b/dev/null
@@ -1,160 +0,0 @@
-#############################################################################
-# Makefile for building: $(OPIEDIR)/bin/opie-update-symlinks
-# Generated by qmake (1.05a) (Qt 3.1.2) on: Tue Mar 16 10:46:29 2004
-# Project:  symlinker.pro
-# Template: app
-# Command: $(QMAKE) -o Makefile symlinker.pro
-#############################################################################
-
-####### Compiler, tools and options
-
-CC       = arm-linux-gcc
-CXX      = arm-linux-g++ -DQT_QWS_IPAQ
-LEX      = flex
-YACC     = yacc
-CFLAGS   = -pipe $(CFLAGS_EXTRA) -Wall -W $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)  -DUSE_REALTIME_AUDIO_THREAD -DOPIE_NEW_MALLOC -DOPIE_SOUND_FRAGMENT_SHIFT=14 -DOPIE_WE_VERSION=15 -DQT_NO_DEBUG
-CXXFLAGS = -pipe $(CFLAGS_EXTRA) -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) -Wall -W $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)  -DUSE_REALTIME_AUDIO_THREAD -DOPIE_NEW_MALLOC -DOPIE_SOUND_FRAGMENT_SHIFT=14 -DOPIE_WE_VERSION=15 -DQT_NO_DEBUG
-LEXFLAGS = 
-YACCFLAGS= -d
-INCPATH  = -I/opt/arm/opie//mkspecs/qws/linux-ipaq-g++ -I. -I$(OPIEDIR)/include -I$(QTDIR)/include -I.moc/$(PLATFORM)/
-LINK     = arm-linux-gcc
-LFLAGS   = $(LFLAGS_EXTRA) -Wl,-rpath=$(OPIEDIR)/lib
-LIBS     = $(SUBLIBS)  -Wl,-rpath-link,$(OPIEDIR)/lib -L$(OPIEDIR)/lib  -Wl,-rpath-link,$(QTDIR)/lib -L$(QTDIR)/lib $(LIBS_EXTRA) -lqpe -lopie -lqte
-AR       = ar cqs
-RANLIB   = 
-MOC      = $(QTDIR)/bin/moc
-UIC      = $(QTDIR)/bin/uic
-QMAKE    = qmake
-TAR      = tar -cf
-GZIP     = gzip -9f
-COPY     = cp -f
-COPY_FILE= $(COPY) -p
-COPY_DIR = $(COPY) -pR
-DEL_FILE = rm -f
-SYMLINK  = ln -sf
-DEL_DIR  = rmdir
-MOVE     = mv -f
-PRO      = symlinker.pro
-CHK_DIR_EXISTS= test -d
-MKDIR    = mkdir -p
-
-####### Output directory
-
-OBJECTS_DIR = .obj/$(PLATFORM)/
-
-####### Files
-
-HEADERS = 
-SOURCES = main.cpp
-OBJECTS = .obj/$(PLATFORM)/main.o
-FORMS = 
-UICDECLS = 
-UICIMPLS = 
-SRCMOC   = 
-OBJMOC = 
-        DIST   = ../../gen.pro \
-                ../../include.pro \
-                symlinker.pro
-QMAKE_TARGET = opie-update-symlinks
-DESTDIR  = $(OPIEDIR)/bin/
-TARGET   = $(OPIEDIR)/bin/opie-update-symlinks
-
-first: all
-####### Implicit rules
-
-.SUFFIXES: .c .cpp .cc .cxx .C
-
-.cpp.o:
-        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-        $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-all: Makefile $(TARGET)
-
-$(TARGET):  $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-        test -d $(OPIEDIR)/bin/ || mkdir -p $(OPIEDIR)/bin/
-        $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
-
-mocables: $(SRCMOC)
-
-$(MOC): 
-        ( cd $(QTDIR)/src/moc ; $(MAKE) )
-
-Makefile: symlinker.pro  /opt/arm/opie//mkspecs/qws/linux-ipaq-g++/qmake.conf ../../gen.pro \
-                ../../include.pro
-        $(QMAKE) -o Makefile symlinker.pro
-qmake: 
-        @$(QMAKE) -o Makefile symlinker.pro
-
-dist: 
-        @mkdir -p .obj/$(PLATFORM)/opie-update-symlinks && $(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) .obj/$(PLATFORM)/opie-update-symlinks/ && ( cd `dirname .obj/$(PLATFORM)/opie-update-symlinks` && $(TAR) opie-update-symlinks.tar opie-update-symlinks && $(GZIP) opie-update-symlinks.tar ) && $(MOVE) `dirname .obj/$(PLATFORM)/opie-update-symlinks`/opie-update-symlinks.tar.gz . && $(DEL_FILE) -r .obj/$(PLATFORM)/opie-update-symlinks
-
-mocclean:
-
-uiclean:
-
-yaccclean:
-lexclean:
-clean:
-        -$(DEL_FILE) $(OBJECTS) 
-        -$(DEL_FILE) *~ core *.core
-
-
-####### Sub-libraries
-
-distclean: clean
-        -$(DEL_FILE) $(OPIEDIR)/bin/$(TARGET) $(TARGET)
-
-
-lupdate:
-        lupdate -noobsolete $(PRO)
-
-lrelease:
-        lrelease $(PRO)
-
-ipk:
-        tmp=`mktemp -d /tmp/ipkg-opie.XXXXXXXXXX` && ( $(MAKE) INSTALL_ROOT="" install && ipkg-build ; rm -rf ; )
-
-opie-lupdate:
-        opie-lupdate $(PRO)
-
-opie-lrelease:
-        opie-lrelease $(PRO)
-
-messages:
-        xgettext -C -n -ktr -kQT_TRANSLATE_NOOP main.cpp -o '$(OPIEDIR)/messages-$(QMAKE_TARGET)-tr.po' && xgettext -C -n -a main.cpp -o '$(OPIEDIR)/messages-$(QMAKE_TARGET)-allstrings.po'
-
-FORCE:
-
-####### Compile
-
-.obj/$(PLATFORM)/main.o: main.cpp 
-        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o .obj/$(PLATFORM)/main.o main.cpp
-
-####### Install
-
-install_target: 
-        @$(CHK_DIR_EXISTS) "$(INSTALL_ROOT)$(OPIEDIR)/bin/" || $(MKDIR) "$(INSTALL_ROOT)$(OPIEDIR)/bin/"
-        -$(COPY) "$(OPIEDIR)/bin/$(QMAKE_TARGET)" "$(INSTALL_ROOT)$(OPIEDIR)/bin/$(QMAKE_TARGET)"
-
-uninstall_target: 
-        -$(DEL_FILE) "$(INSTALL_ROOT)$(OPIEDIR)/bin/$(QMAKE_TARGET)"
-        -$(DEL_DIR) "$(INSTALL_ROOT)$(OPIEDIR)/bin/"
-
-
-install: all install_target 
-
-uninstall: uninstall_target 
-
diff --git a/core/symlinker/config.in b/core/symlinker/config.in
index b68018f..f87778a 100644
--- a/core/symlinker/config.in
+++ b/core/symlinker/config.in
@@ -1,5 +1,7 @@
   config SYMLINKER
     boolean "Opie Symlinker for external media"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LAUNCHER
+    depends ( LIBQPE || LIBQPE-X11 )
+    comment "Opie Symlinker needs a libqpe"
+    depends !( LIBQPE || LIBQPE-X11 )
 
diff --git a/core/symlinker/symlinker.pro b/core/symlinker/symlinker.pro
index 9558b3e..646c9fd 100644
--- a/core/symlinker/symlinker.pro
+++ b/core/symlinker/symlinker.pro
@@ -9,7 +9,7 @@ INTERFACES	=
         TARGET  = opie-update-symlinks
 INCLUDEPATH     += $(OPIEDIR)/include 
 DEPENDPATH      += $(OPIEDIR)/include .
-LIBS            += -lqpe -lopie
+LIBS            += -lqpe
 
 include ( $(OPIEDIR)/include.pro )