switched date and size columns, added about, and fixed a bug with move

1 files changed, 166 insertions, 48 deletions

diff --git a/noncore/apps/advancedfm/Makefile b/noncore/apps/advancedfm/Makefile
index 4622c6e..8799b03 100644
--- a/noncore/apps/advancedfm/Makefile
+++ b/noncore/apps/advancedfm/Makefile
@@ -1,25 +1,124 @@
 #############################################################################
-# Makefile for building $(OPIEDIR)/bin/advancedfm
-# Generated by tmake at 18:31, 2002/04/15
-#     Project: advancedfm
-#    Template: app
+# Automatically generated from noncore/advancedfm/Makefile.in
+# Build options from 
 #############################################################################
 
-####### Compiler, tools and options
+# Compiling
+INTERFACE_DECL_PATH 	= .
+SYSCONF_CXX		= g++
+SYSCONF_CC		= gcc
+DASHCROSS		= 
+
+# Compiling with support libraries
+SYSCONF_CXXFLAGS_X11	= 
+SYSCONF_CXXFLAGS_QT	= -I$(QTDIR)/include
+SYSCONF_CXXFLAGS_OPENGL	= -I/usr/X11R6/include
+
+# Compiling YACC output
+SYSCONF_CXXFLAGS_YACC     = -Wno-unused -Wno-parentheses
+
+# Linking with support libraries
+SYSCONF_RPATH_X11	= 
+SYSCONF_RPATH_QT	= -Wl,-rpath,$(QTDIR)/lib
+SYSCONF_RPATH_OPENGL	= -Wl,-rpath,/usr/X11R6/lib
+
+# Linking with support libraries
+# X11
+SYSCONF_LFLAGS_X11	= 
+SYSCONF_LIBS_X11	= 
+# Qt, Qt+OpenGL
+SYSCONF_LFLAGS_QT	= -L$(QTDIR)/lib
+SYSCONF_LIBS_QT		= -lqte$(QT_THREAD_SUFFIX)
+SYSCONF_LIBS_QT_OPENGL	= 
+# OpenGL
+SYSCONF_LFLAGS_OPENGL	= -L/usr/X11R6/lib
+SYSCONF_LIBS_OPENGL	= 
+# Yacc
+SYSCONF_LIBS_YACC	= 
+
+# Linking applications
+SYSCONF_LINK		= gcc
+SYSCONF_LFLAGS		= 
+SYSCONF_LIBS		= 
+
+# Link flags for shared objects
+SYSCONF_LFLAGS_SHOBJ	= -shared
+
+# Flags for threading
+SYSCONF_CFLAGS_THREAD	= -D_REENTRANT
+SYSCONF_CXXFLAGS_THREAD	= -D_REENTRANT
+SYSCONF_LFLAGS_THREAD	= 
+SYSCONF_LIBS_THREAD	=  -lpthread
+
+# Meta-object compiler
+SYSCONF_MOC		= $(QTDIR)/bin/moc
+
+# UI compiler
+SYSCONF_UIC		= $(QTDIR)/bin/uic
+
+# Linking shared libraries
+#   - Build the $(TARGET) library, eg. lib$(TARGET).so.2.2.2
+#   - Place target in $(DESTDIR) - which has a trailing /
+#   - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH)
+#
+SYSCONF_LINK_SHLIB	= gcc
+SYSCONF_LINK_TARGET_SHARED	= lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH)
+SYSCONF_LINK_LIB_SHARED	=  $(SYSCONF_LINK_SHLIB) -shared -Wl,-soname,lib$(TARGET).so.$(VER_MAJ) \
+				     $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \
+				     $(OBJECTS) $(OBJMOC) $(LIBS) && \
+				 mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \
+				 cd $(DESTDIR) && \
+				 rm -f lib$(TARGET).so lib$(TARGET).so.$(VER_MAJ) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN); \
+				 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so; \
+				 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ); \
+				 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN)
+
+# Linking static libraries
+#   - Build the $(TARGET) library, eg. lib$(TARGET).a
+#   - Place target in $(DESTDIR) - which has a trailing /
+#
+SYSCONF_AR		= ar cqs
+SYSCONF_LINK_TARGET_STATIC = lib$(TARGET).a
+SYSCONF_LINK_LIB_STATIC	= rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
+				 $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) 
+# Compiling application source
+SYSCONF_CXXFLAGS	= -pipe -DQWS -fno-exceptions -fno-rtti -O2 -Wall -W
+SYSCONF_CFLAGS		= -pipe -O2 -Wall -W
+# Default link type (static linking is still be used where required)
+SYSCONF_LINK_LIB	= $(SYSCONF_LINK_LIB_SHARED)
+SYSCONF_LINK_TARGET	= $(SYSCONF_LINK_TARGET_SHARED)
+# Compiling library source
+SYSCONF_CXXFLAGS_LIB	= -fPIC
+SYSCONF_CFLAGS_LIB	= -fPIC
+# Compiling shared-object source
+SYSCONF_CXXFLAGS_SHOBJ	= -fPIC
+SYSCONF_CFLAGS_SHOBJ	= -fPIC
+# Linking Qt
+SYSCONF_LIBS_QTLIB	= $(SYSCONF_LFLAGS_X11) $(QT_LIBS_MT) $(QT_LIBS_OPT)
+# Linking Qt applications
+SYSCONF_LIBS_QTAPP	= 
+#############################################################################
 
-CC	=	gcc
-CXX	=	g++
-CFLAGS	=	-pipe -Wall -W -O2 -fno-default-inline -DNO_DEBUG
-CXXFLAGS=	-pipe -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -fno-default-inline -DNO_DEBUG
-INCPATH	=	-I$(OPIEDIR)/include -I$(QTDIR)/include
-LINK	=	g++
-LFLAGS	=	
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lqpe -lqte
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
+####### Compiler, tools and options
 
-TAR	=	tar -cf
-GZIP	=	gzip -9f
+CXX	=	$(SYSCONF_CXX) $(QT_CXX_MT)
+CXXFLAGS=	$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
+CC	=	$(SYSCONF_CC) $(QT_C_MT)
+CFLAGS	=	$(SYSCONF_CFLAGS)
+INCPATH =	-I$(OPIEDIR)/include
+LFLAGS	=	$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
+LIBS	=	$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
+MOC	=	$(SYSCONF_MOC)
+UIC	=	$(SYSCONF_UIC)
+
+####### Target
+
+DESTDIR = $(OPIEDIR)/bin/
+VER_MAJ = 1
+VER_MIN = 0
+VER_PATCH = 0
+TARGET	= advancedfm
+TARGET1 = lib$(TARGET).so.$(VER_MAJ)
 
 ####### Files
 
@@ -37,9 +136,9 @@ OBJECTS =	advancedfm.o \
 		filePermissions.o \
 		output.o \
 		main.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
+INTERFACES =    
+UICDECLS =      
+UICIMPLS =      
 SRCMOC	=	moc_advancedfm.cpp \
 		moc_inputDialog.cpp \
 		moc_filePermissions.cpp \
@@ -48,9 +147,7 @@ OBJMOC	=	moc_advancedfm.o \
 		moc_inputDialog.o \
 		moc_filePermissions.o \
 		moc_output.o
-DIST	=	
-TARGET	=	$(OPIEDIR)/bin/advancedfm
-INTERFACE_DECL_PATH = .
+
 
 ####### Implicit rules
 
@@ -74,25 +171,37 @@ INTERFACE_DECL_PATH = .
 ####### Build rules
 
 
-all: $(TARGET)
+all: $(DESTDIR)$(TARGET)
 
-$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
+$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
+	$(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
 
 moc: $(SRCMOC)
 
-tmake: Makefile
-
-Makefile: advancedfm.pro
-	tmake advancedfm.pro -o Makefile
-
-dist:
-	$(TAR) advancedfm.tar advancedfm.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) advancedfm.tar
+tmake:
+	tmake advancedfm.pro
 
 clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
+	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
 	-rm -f *~ core
+	-rm -f allmoc.cpp
+
+####### Extension Modules
+
+listpromodules:
+	@echo 
+
+listallmodules:
+	@echo 
+
+listaddonpromodules:
+	@echo 
+
+listaddonentmodules:
+	@echo 
+
+
+REQUIRES=medium-config
 
 ####### Sub-libraries
 
@@ -100,6 +209,7 @@ clean:
 ###### Combined headers
 
 
+
 ####### Compile
 
 advancedfm.o: advancedfm.cpp \
@@ -107,16 +217,16 @@ advancedfm.o: advancedfm.cpp \
 		inputDialog.h \
 		filePermissions.h \
 		output.h \
-		/usr/src/oldsrc/Opie/opie/include/qpe/lnkproperties.h \
-		/usr/src/oldsrc/Opie/opie/include/qpe/filemanager.h \
-		/usr/src/oldsrc/Opie/opie/include/qpe/qcopenvelope_qws.h \
-		/usr/src/oldsrc/Opie/opie/include/qpe/qpemenubar.h \
-		/usr/src/oldsrc/Opie/opie/include/qpe/qpetoolbar.h \
-		/usr/src/oldsrc/Opie/opie/include/qpe/qpeapplication.h \
-		/usr/src/oldsrc/Opie/opie/include/qpe/resource.h \
-		/usr/src/oldsrc/Opie/opie/include/qpe/config.h \
-		/usr/src/oldsrc/Opie/opie/include/qpe/mimetype.h \
-		/usr/src/oldsrc/Opie/opie/include/qpe/applnk.h
+		$(OPIEDIR)/include/qpe/lnkproperties.h \
+		$(OPIEDIR)/include/qpe/filemanager.h \
+		$(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
+		$(OPIEDIR)/include/qpe/qpemenubar.h \
+		$(OPIEDIR)/include/qpe/qpetoolbar.h \
+		$(OPIEDIR)/include/qpe/qpeapplication.h \
+		$(OPIEDIR)/include/qpe/resource.h \
+		$(OPIEDIR)/include/qpe/config.h \
+		$(OPIEDIR)/include/qpe/mimetype.h \
+		$(OPIEDIR)/include/qpe/applnk.h
 
 inputDialog.o: inputDialog.cpp \
 		inputDialog.h
@@ -128,9 +238,9 @@ output.o: output.cpp \
 		output.h
 
 main.o: main.cpp \
-		/usr/src/oldsrc/Opie/opie/include/qpe/qpeapplication.h \
-		/usr/src/oldsrc/Opie/opie/include/qpe/qcopenvelope_qws.h \
-		/usr/src/oldsrc/Opie/opie/include/qpe/config.h \
+		$(OPIEDIR)/include/qpe/qpeapplication.h \
+		$(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
+		$(OPIEDIR)/include/qpe/config.h \
 		advancedfm.h
 
 moc_advancedfm.o: moc_advancedfm.cpp \
@@ -157,3 +267,11 @@ moc_filePermissions.cpp: filePermissions.h
 moc_output.cpp: output.h
 	$(MOC) output.h -o moc_output.cpp
 
+
+
+lupdate:
+	lupdate advancedfm.pro
+
+lrelease:
+	lrelease advancedfm.pro
+