[oprof-cvs] CVS: oprofile/gui Makefile.in,1.6,1.7 oprof_start.h,1.1,1.2 oprof_start_config.cpp,1.1,1.2 oprof_start_impl.cpp,1.1,1.2 oprof_start.base.ui,1.1,NONE

[John L. <mov...@us...>]

Update of /cvsroot/oprofile/oprofile/gui
In directory usw-pr-cvs1:/tmp/cvs-serv5344/gui

Modified Files:
	Makefile.in oprof_start.h oprof_start_config.cpp 
	oprof_start_impl.cpp 
Removed Files:
	oprof_start.base.ui 
Log Message:
autoconfiscation for Qt2



Index: Makefile.in
===================================================================
RCS file: /cvsroot/oprofile/oprofile/gui/Makefile.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile.in	2001/09/16 01:45:11	1.6
+++ Makefile.in	2001/09/16 18:05:25	1.7
@@ -1,19 +1,23 @@
-all: oprof_start
-
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 BINDIR=@bindir@
 MKDIR_P=mkdir -p
+MOC=@MOC@
+UIC=@UIC@
 
 .PHONY: all clean install uninstall
 .SUFFIXES:
 
+ifeq "@HAVE_QT2@" "1"
+all: oprof_start
+
 # oprof_start.cpp, oprof_start.h are generated file, but must not re-generated
 clean:
-	rm -f *.o *.moc.* oprof_start.base.cpp oprof_start.base.h oprof_start
+	$(MAKE) -C ui clean
+	rm -f *.o *.moc.* oprof_start
 
 # TODO: the sys_include is for the <sstream> thing add it to distrib
-CFLAGS=-I ../sys_include -DOP_EVENTS_DESC -g -ansi -Wall --pedantic -O2
+CFLAGS=-I@KINC@ -I../sys_include -DOP_EVENTS_DESC -g -ansi -Wall --pedantic -O2 @QT2_INCLUDES@
 
 install: all oprofile oprof_start
 	-$(MKDIR_P) $(BINDIR)
@@ -27,12 +31,13 @@
 	@echo "The uninstall target does not remove your ~/.oprofile directory"
 	@echo "---------------------------------------------------------------"
 
-SOURCES=oprof_start.base.o oprof_start.base.moc.o oprof_start.o \
- oprof_start.moc.o oprof_start_impl.o op_events.o oprof_start_config.o \
- oprof_start_main.o
+UISOURCES=ui/oprof_start.base.o ui/oprof_start.base.moc.o
+SOURCES=oprof_start.o oprof_start.moc.o oprof_start_impl.o op_events.o \
+ oprof_start_config.o oprof_start_main.o
 
 oprof_start: $(SOURCES)
-	g++ -o $@ $^ -L$(QTDIR)/lib -lqt
+	$(MAKE) -C ui
+	g++ -o $@ $^ $(UISOURCES) @QT2_LDFLAGS@ @QT2_LIBS@
 
 %.o: %.cpp
 	g++ -c $(CFLAGS) $< -o $@
@@ -43,46 +48,31 @@
 op_events.o: ../op_events.c
 	gcc -c $(CFLAGS) $< -o $@
 
-# dependencies: auto-generated through CFLAGS += -MM, cat *.o
+ui/oprof_start.base.h:
+	$(MAKE) -C ui
+ 
 op_events.o: ../op_events.c ../op_user.h ../version.h
-oprof_start.base.moc.o: oprof_start.base.moc.cpp oprof_start.base.h
-oprof_start.base.o: oprof_start.base.cpp oprof_start.base.h
 oprof_start.moc.o: oprof_start.moc.cpp oprof_start.h \
- oprof_start.base.h oprof_start_config.h persistent_config.h \
+ ui/oprof_start.base.h oprof_start_config.h persistent_config.h \
  ../op_user.h ../version.h
-oprof_start.o: oprof_start.cpp oprof_start.h oprof_start.base.h \
+oprof_start.o: oprof_start.cpp oprof_start.h ui/oprof_start.base.h \
  oprof_start_config.h persistent_config.h ../op_user.h ../version.h
 oprof_start_config.o: oprof_start_config.cpp oprof_start_config.h \
  persistent_config.h ../op_user.h ../version.h
 oprof_start_impl.o: oprof_start_impl.cpp oprof_start.h \
- oprof_start.base.h oprof_start_config.h persistent_config.h \
+ ui/oprof_start.base.h oprof_start_config.h persistent_config.h \
  ../op_user.h ../version.h
 oprof_start_main.o: oprof_start_main.cpp oprof_start.h \
- oprof_start.base.h oprof_start_config.h persistent_config.h \
+ ui/oprof_start.base.h oprof_start_config.h persistent_config.h \
  ../op_user.h ../version.h            
 
-# generate qt header file
-oprof_start.base.h: oprof_start.base.ui
-	uic -o oprof_start.base.h oprof_start.base.ui
-
-# generate qt implementation file
-oprof_start.base.cpp: oprof_start.base.h oprof_start.base.ui
-	uic -o oprof_start.base.cpp -impl oprof_start.base.h oprof_start.base.ui
-
-# generate qt moc code for base class
-oprof_start.base.moc.cpp: oprof_start.base.h
-	moc -o oprof_start.base.moc.cpp oprof_start.base.h
-
 # generate qt moc code for subclass
-oprof_start.moc.cpp: oprof_start.h oprof_start.base.moc.cpp
-	moc -o oprof_start.moc.cpp oprof_start.h
-
-# DO NOT un-comment these lines: just an examples of how to start a new form.
-# after using this line you must edit oprof_start.cpp and replace the include
-# oprof_start_base.h by oprof_start.h before compile it. I follow the following
-# name scheme : xxxx.base.ui is the saved designer file form. xxxx_base.cpp/.h
-# are base class read-only file. xxx.cpp/.h are derived class.
+oprof_start.moc.cpp: oprof_start.h ui/oprof_start.base.moc.cpp
+	$(MOC) -o oprof_start.moc.cpp oprof_start.h
 
-# generate qt subclass header/implementation file, these file are created once
-#uic -o oprof_start.h -subdecl oprof_start oprof_start.base.h oprof_start.base.ui
-#uic -o oprof_start.cpp -subimpl oprof_start oprof_start.h oprof_start.base.ui
+else
+all:
+clean:
+install:
+uninstall:
+endif

Index: oprof_start.h
===================================================================
RCS file: /cvsroot/oprofile/oprofile/gui/oprof_start.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- oprof_start.h	2001/09/16 02:21:22	1.1
+++ oprof_start.h	2001/09/16 18:05:25	1.2
@@ -19,7 +19,7 @@
 
 #include <vector>
 
-#include "oprof_start.base.h"
+#include "ui/oprof_start.base.h"
 #include "oprof_start_config.h"
 #include "persistent_config.h"
 #include "../op_user.h"

Index: oprof_start_config.cpp
===================================================================
RCS file: /cvsroot/oprofile/oprofile/gui/oprof_start_config.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- oprof_start_config.cpp	2001/09/16 02:21:22	1.1
+++ oprof_start_config.cpp	2001/09/16 18:05:25	1.2
@@ -64,7 +64,8 @@
 	return get_user_dir() + "/" + filename;
 }
 
-// too tricky perhaps: exec a command and redirect stdout / stdout to the
+// FIXME: let's use a proper fork/exec with pipes
+// too tricky perhaps: exec a command and redirect stdout / stderr to the
 // corresponding ostream.
 int exec_command(const std::string& cmd_line, std::ostream& out, 
 		 std::ostream& err)
@@ -72,7 +73,7 @@
 	char name_stdout[L_tmpnam];
 	char name_stderr[L_tmpnam];
 
-	// using tmpnam is not recommanded...
+	// FIXME: using tmpnam is not recommanded...
 	tmpnam(name_stdout);
 	tmpnam(name_stderr);
 

Index: oprof_start_impl.cpp
===================================================================
RCS file: /cvsroot/oprofile/oprofile/gui/oprof_start_impl.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- oprof_start_impl.cpp	2001/09/16 02:21:22	1.1
+++ oprof_start_impl.cpp	2001/09/16 18:05:25	1.2
@@ -107,6 +107,7 @@
 	return result;
 }
 
+#if 0 
 void display_qt_hierarchy(QObject* root, int level = 0)
 {
 	for (int i = 0 ; i < level * 2 ; ++i) {
@@ -137,6 +138,7 @@
 		// delete l;
 	}
 }
+#endif 
 
 // like posix shell utils basename, do not append trailing '/' to result.
 std::string basename(const std::string& path_name)

--- oprof_start.base.ui DELETED ---