Separated out app object, added character window.

[ttedit] / Makefile

diff --git a/Makefile b/Makefile
index 8dc2ae16b6cc65bcfb6f4bf6bd5f1335f0b66e88..baaff9389cd8aa3416d63662f3bb860e1c10f2be 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: ttedit
-# Generated by qmake (2.01a) (Qt 4.5.0-rc1) on: Fri Mar 13 16:09:54 2009
+# Generated by qmake (2.01a) (Qt 4.5.0) on: Thu Mar 19 15:27:43 2009
 # Project:  ttedit.pro
 # Template: app
 # Command: /usr/bin/qmake -unix -o Makefile ttedit.pro
@@ -43,25 +43,31 @@ OBJECTS_DIR   = obj/
 ####### Files
 
 SOURCES       = src/ttedit.cpp \
+               src/ttemainwindow.cpp \
                src/editwindow.cpp \
                src/glyphpoints.cpp \
                src/debug.cpp \
                src/toolwindow.cpp \
+               src/charwindow.cpp \
                src/vector.cpp \
-               src/graphicprimitives.cpp obj/moc_ttedit.cpp \
+               src/graphicprimitives.cpp obj/moc_ttemainwindow.cpp \
                obj/moc_editwindow.cpp \
                obj/moc_toolwindow.cpp \
+               obj/moc_charwindow.cpp \
                obj/qrc_ttedit.cpp
 OBJECTS       = obj/ttedit.o \
+               obj/ttemainwindow.o \
                obj/editwindow.o \
                obj/glyphpoints.o \
                obj/debug.o \
                obj/toolwindow.o \
+               obj/charwindow.o \
                obj/vector.o \
                obj/graphicprimitives.o \
-               obj/moc_ttedit.o \
+               obj/moc_ttemainwindow.o \
                obj/moc_editwindow.o \
                obj/moc_toolwindow.o \
+               obj/moc_charwindow.o \
                obj/qrc_ttedit.o
 DIST          = /usr/share/qt4/mkspecs/common/g++.conf \
                /usr/share/qt4/mkspecs/common/unix.conf \
@@ -159,7 +165,7 @@ qmake:  FORCE
 
 dist: 
        @$(CHK_DIR_EXISTS) obj/ttedit1.0.0 || $(MKDIR) obj/ttedit1.0.0 
-       $(COPY_FILE) --parents $(SOURCES) $(DIST) obj/ttedit1.0.0/ && $(COPY_FILE) --parents src/ttedit.h src/editwindow.h src/glyphpoints.h src/types.h src/debug.h src/toolwindow.h src/vector.h src/graphicprimitives.h src/list.h obj/ttedit1.0.0/ && $(COPY_FILE) --parents ttedit.qrc obj/ttedit1.0.0/ && $(COPY_FILE) --parents src/ttedit.cpp src/editwindow.cpp src/glyphpoints.cpp src/debug.cpp src/toolwindow.cpp src/vector.cpp src/graphicprimitives.cpp obj/ttedit1.0.0/ && (cd `dirname obj/ttedit1.0.0` && $(TAR) ttedit1.0.0.tar ttedit1.0.0 && $(COMPRESS) ttedit1.0.0.tar) && $(MOVE) `dirname obj/ttedit1.0.0`/ttedit1.0.0.tar.gz . && $(DEL_FILE) -r obj/ttedit1.0.0
+       $(COPY_FILE) --parents $(SOURCES) $(DIST) obj/ttedit1.0.0/ && $(COPY_FILE) --parents src/ttedit.h src/ttemainwindow.h src/editwindow.h src/glyphpoints.h src/types.h src/debug.h src/toolwindow.h src/charwindow.h src/vector.h src/graphicprimitives.h src/list.h obj/ttedit1.0.0/ && $(COPY_FILE) --parents ttedit.qrc obj/ttedit1.0.0/ && $(COPY_FILE) --parents src/ttedit.cpp src/ttemainwindow.cpp src/editwindow.cpp src/glyphpoints.cpp src/debug.cpp src/toolwindow.cpp src/charwindow.cpp src/vector.cpp src/graphicprimitives.cpp obj/ttedit1.0.0/ && (cd `dirname obj/ttedit1.0.0` && $(TAR) ttedit1.0.0.tar ttedit1.0.0 && $(COMPRESS) ttedit1.0.0.tar) && $(MOVE) `dirname obj/ttedit1.0.0`/ttedit1.0.0.tar.gz . && $(DEL_FILE) -r obj/ttedit1.0.0
 
 
 clean:compiler_clean 
@@ -178,22 +184,26 @@ mocclean: compiler_moc_header_clean compiler_moc_source_clean
 
 mocables: compiler_moc_header_make_all compiler_moc_source_make_all
 
-compiler_moc_header_make_all: obj/moc_ttedit.cpp obj/moc_editwindow.cpp obj/moc_toolwindow.cpp
+compiler_moc_header_make_all: obj/moc_ttemainwindow.cpp obj/moc_editwindow.cpp obj/moc_toolwindow.cpp obj/moc_charwindow.cpp
 compiler_moc_header_clean:
-       -$(DEL_FILE) obj/moc_ttedit.cpp obj/moc_editwindow.cpp obj/moc_toolwindow.cpp
-obj/moc_ttedit.cpp: src/ttedit.h
-       /usr/bin/moc $(DEFINES) $(INCPATH) src/ttedit.h -o obj/moc_ttedit.cpp
+       -$(DEL_FILE) obj/moc_ttemainwindow.cpp obj/moc_editwindow.cpp obj/moc_toolwindow.cpp obj/moc_charwindow.cpp
+obj/moc_ttemainwindow.cpp: src/ttemainwindow.h
+       /usr/bin/moc $(DEFINES) $(INCPATH) src/ttemainwindow.h -o obj/moc_ttemainwindow.cpp
 
 obj/moc_editwindow.cpp: src/types.h \
                src/toolwindow.h \
                src/glyphpoints.h \
-               src/ttedit.h \
                src/editwindow.h
        /usr/bin/moc $(DEFINES) $(INCPATH) src/editwindow.h -o obj/moc_editwindow.cpp
 
 obj/moc_toolwindow.cpp: src/toolwindow.h
        /usr/bin/moc $(DEFINES) $(INCPATH) src/toolwindow.h -o obj/moc_toolwindow.cpp
 
+obj/moc_charwindow.cpp: src/glyphpoints.h \
+               src/types.h \
+               src/charwindow.h
+       /usr/bin/moc $(DEFINES) $(INCPATH) src/charwindow.h -o obj/moc_charwindow.cpp
+
 compiler_rcc_make_all: obj/qrc_ttedit.cpp
 compiler_rcc_clean:
        -$(DEL_FILE) obj/qrc_ttedit.cpp
@@ -232,12 +242,16 @@ compiler_clean: compiler_moc_header_clean compiler_rcc_clean
 ####### Compile
 
 obj/ttedit.o: src/ttedit.cpp src/ttedit.h \
+               src/ttemainwindow.h
+       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/ttedit.o src/ttedit.cpp
+
+obj/ttemainwindow.o: src/ttemainwindow.cpp src/ttemainwindow.h \
                src/editwindow.h \
                src/types.h \
                src/toolwindow.h \
                src/glyphpoints.h \
                src/charwindow.h \
-               src/tte_res.h \
+               src/ttedit.h \
                src/debug.h \
                res/cur1.xpm \
                res/cur2.xpm \
@@ -251,16 +265,17 @@ obj/ttedit.o: src/ttedit.cpp src/ttedit.h \
                res/tool1.xpm \
                res/tool2.xpm \
                res/tool3.xpm
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/ttedit.o src/ttedit.cpp
+       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/ttemainwindow.o src/ttemainwindow.cpp
 
 obj/editwindow.o: src/editwindow.cpp src/editwindow.h \
                src/types.h \
                src/toolwindow.h \
                src/glyphpoints.h \
-               src/ttedit.h \
                src/graphicprimitives.h \
                src/debug.h \
-               src/vector.h
+               src/vector.h \
+               src/charwindow.h \
+               src/ttedit.h
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/editwindow.o src/editwindow.cpp
 
 obj/glyphpoints.o: src/glyphpoints.cpp src/glyphpoints.h \
@@ -275,6 +290,12 @@ obj/toolwindow.o: src/toolwindow.cpp src/toolwindow.h \
                src/types.h
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/toolwindow.o src/toolwindow.cpp
 
+obj/charwindow.o: src/charwindow.cpp src/charwindow.h \
+               src/glyphpoints.h \
+               src/types.h \
+               src/debug.h
+       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/charwindow.o src/charwindow.cpp
+
 obj/vector.o: src/vector.cpp src/vector.h
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/vector.o src/vector.cpp
 
@@ -282,8 +303,8 @@ obj/graphicprimitives.o: src/graphicprimitives.cpp src/graphicprimitives.h \
                src/types.h
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/graphicprimitives.o src/graphicprimitives.cpp
 
-obj/moc_ttedit.o: obj/moc_ttedit.cpp 
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_ttedit.o obj/moc_ttedit.cpp
+obj/moc_ttemainwindow.o: obj/moc_ttemainwindow.cpp 
+       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_ttemainwindow.o obj/moc_ttemainwindow.cpp
 
 obj/moc_editwindow.o: obj/moc_editwindow.cpp 
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_editwindow.o obj/moc_editwindow.cpp
@@ -291,6 +312,9 @@ obj/moc_editwindow.o: obj/moc_editwindow.cpp
 obj/moc_toolwindow.o: obj/moc_toolwindow.cpp 
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_toolwindow.o obj/moc_toolwindow.cpp
 
+obj/moc_charwindow.o: obj/moc_charwindow.cpp 
+       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_charwindow.o obj/moc_charwindow.cpp
+
 obj/qrc_ttedit.o: obj/qrc_ttedit.cpp 
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/qrc_ttedit.o obj/qrc_ttedit.cpp