--- src/makefile | 16 +- src/qt-gui/Makefile | 346 ---------------------------------------------------- 2 files changed, 8 insertions(+), 354 deletions(-) Index: src/makefile =================================================================== --- src/makefile.orig 2012-01-04 16:17:59.000000000 +0100 +++ src/makefile 2013-10-28 13:59:17.438555472 +0100 @@ -2,26 +2,26 @@ # This file will compile the ansifilter binary. # See INSTALL for instructions. -CC=g++ +CXX = g++ -CFLAGS= -c -Wall -O2 +CXXFLAGS = -c -Wall -O2 $(RPM_OPT_FLAGS) -LDFLAGS= +LDFLAGS = -SOURCES=arg_parser.o stringtools.o cmdlineoptions.o main.o platform_fs.o\ +SOURCES = arg_parser.o stringtools.o cmdlineoptions.o main.o platform_fs.o\ codegenerator.o htmlgenerator.o texgenerator.o latexgenerator.o rtfgenerator.o\ plaintextgenerator.o bbcodegenerator.o elementstyle.o stylecolour.o preformatter.o -OBJECTS=$(SOURCES:.cpp=.o) -EXECUTABLE=ansifilter +OBJECTS = $(SOURCES:.cpp=.o) +EXECUTABLE = ansifilter all: $(SOURCES) $(EXECUTABLE) $(EXECUTABLE): $(OBJECTS) - $(CC) $(LDFLAGS) $(OBJECTS) -o $@ + $(CXX) $(LDFLAGS) $(OBJECTS) -o $@ .cpp.o: - $(CC) $(CFLAGS) $< -o $@ + $(CXX) $(CXXFLAGS) $< -o $@ clean: @rm -f *.o Index: src/qt-gui/Makefile =================================================================== --- src/qt-gui/Makefile 2012-01-04 19:11:18.000000000 +0100 +++ /dev/null 1970-01-01 00:00:00.000000000 +0000 @@ -1,346 +0,0 @@ -############################################################################# -# Makefile for building: ansifilter-gui -# Generated by qmake (2.01a) (Qt 4.7.4) on: Mi. Jan 4 19:11:18 2012 -# Project: ansifilter-gui.pro -# Template: app -# Command: /usr/bin/qmake -o Makefile ansifilter-gui.pro -############################################################################# - -####### Compiler, tools and options - -CC = gcc -CXX = g++ -DEFINES = -DO2 -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED -CFLAGS = -m64 -pipe -march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2 -fno-strict-aliasing -Wall -W -D_REENTRANT $(DEFINES) -CXXFLAGS = -m64 -pipe -march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2 -fno-strict-aliasing -Wall -W -D_REENTRANT $(DEFINES) -INCPATH = -I/usr/share/qt/mkspecs/linux-g++-64 -I. -I/usr/include/QtCore -I/usr/include/QtGui -I/usr/include -I. -I.. -I. -I. -LINK = g++ -LFLAGS = -m64 -Wl,-O1,--sort-common,--as-needed,-z,relro,--hash-style=gnu -Wl,-O1 -LIBS = $(SUBLIBS) -L/usr/lib -lQtGui -lQtCore -lpthread -AR = ar cqs -RANLIB = -QMAKE = /usr/bin/qmake -TAR = tar -cf -COMPRESS = gzip -9f -COPY = cp -f -SED = sed -COPY_FILE = $(COPY) -COPY_DIR = $(COPY) -r -STRIP = strip -INSTALL_FILE = install -m 644 -p -INSTALL_DIR = $(COPY_DIR) -INSTALL_PROGRAM = install -m 755 -p -DEL_FILE = rm -f -SYMLINK = ln -f -s -DEL_DIR = rmdir -MOVE = mv -f -CHK_DIR_EXISTS= test -d -MKDIR = mkdir -p - -####### Output directory - -OBJECTS_DIR = ./ - -####### Files - -SOURCES = main.cpp \ - mydialog.cpp \ - ../elementstyle.cpp \ - ../plaintextgenerator.cpp \ - ../codegenerator.cpp \ - ../platform_fs.cpp \ - ../rtfgenerator.cpp \ - ../htmlgenerator.cpp \ - ../texgenerator.cpp \ - ../latexgenerator.cpp \ - ../bbcodegenerator.cpp \ - ../stringtools.cpp \ - ../stylecolour.cpp \ - ../preformatter.cpp moc_mydialog.cpp -OBJECTS = main.o \ - mydialog.o \ - elementstyle.o \ - plaintextgenerator.o \ - codegenerator.o \ - platform_fs.o \ - rtfgenerator.o \ - htmlgenerator.o \ - texgenerator.o \ - latexgenerator.o \ - bbcodegenerator.o \ - stringtools.o \ - stylecolour.o \ - preformatter.o \ - moc_mydialog.o -DIST = /usr/share/qt/mkspecs/common/g++.conf \ - /usr/share/qt/mkspecs/common/unix.conf \ - /usr/share/qt/mkspecs/common/linux.conf \ - /usr/share/qt/mkspecs/qconfig.pri \ - /usr/share/qt/mkspecs/modules/qt_phonon.pri \ - /usr/share/qt/mkspecs/modules/qt_webkit_version.pri \ - /usr/share/qt/mkspecs/features/qt_functions.prf \ - /usr/share/qt/mkspecs/features/qt_config.prf \ - /usr/share/qt/mkspecs/features/exclusive_builds.prf \ - /usr/share/qt/mkspecs/features/default_pre.prf \ - /usr/share/qt/mkspecs/features/release.prf \ - /usr/share/qt/mkspecs/features/default_post.prf \ - /usr/share/qt/mkspecs/features/warn_on.prf \ - /usr/share/qt/mkspecs/features/qt.prf \ - /usr/share/qt/mkspecs/features/unix/thread.prf \ - /usr/share/qt/mkspecs/features/moc.prf \ - /usr/share/qt/mkspecs/features/resources.prf \ - /usr/share/qt/mkspecs/features/uic.prf \ - /usr/share/qt/mkspecs/features/yacc.prf \ - /usr/share/qt/mkspecs/features/lex.prf \ - /usr/share/qt/mkspecs/features/include_source_dir.prf \ - ansifilter-gui.pro -QMAKE_TARGET = ansifilter-gui -DESTDIR = -TARGET = ansifilter-gui - -first: all -####### Implicit rules - -.SUFFIXES: .o .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): ui_ansifilter.h $(OBJECTS) - $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) - -Makefile: ansifilter-gui.pro /usr/share/qt/mkspecs/linux-g++-64/qmake.conf /usr/share/qt/mkspecs/common/g++.conf \ - /usr/share/qt/mkspecs/common/unix.conf \ - /usr/share/qt/mkspecs/common/linux.conf \ - /usr/share/qt/mkspecs/qconfig.pri \ - /usr/share/qt/mkspecs/modules/qt_phonon.pri \ - /usr/share/qt/mkspecs/modules/qt_webkit_version.pri \ - /usr/share/qt/mkspecs/features/qt_functions.prf \ - /usr/share/qt/mkspecs/features/qt_config.prf \ - /usr/share/qt/mkspecs/features/exclusive_builds.prf \ - /usr/share/qt/mkspecs/features/default_pre.prf \ - /usr/share/qt/mkspecs/features/release.prf \ - /usr/share/qt/mkspecs/features/default_post.prf \ - /usr/share/qt/mkspecs/features/warn_on.prf \ - /usr/share/qt/mkspecs/features/qt.prf \ - /usr/share/qt/mkspecs/features/unix/thread.prf \ - /usr/share/qt/mkspecs/features/moc.prf \ - /usr/share/qt/mkspecs/features/resources.prf \ - /usr/share/qt/mkspecs/features/uic.prf \ - /usr/share/qt/mkspecs/features/yacc.prf \ - /usr/share/qt/mkspecs/features/lex.prf \ - /usr/share/qt/mkspecs/features/include_source_dir.prf \ - /usr/lib/libQtGui.prl \ - /usr/lib/libQtCore.prl - $(QMAKE) -o Makefile ansifilter-gui.pro -/usr/share/qt/mkspecs/common/g++.conf: -/usr/share/qt/mkspecs/common/unix.conf: -/usr/share/qt/mkspecs/common/linux.conf: -/usr/share/qt/mkspecs/qconfig.pri: -/usr/share/qt/mkspecs/modules/qt_phonon.pri: -/usr/share/qt/mkspecs/modules/qt_webkit_version.pri: -/usr/share/qt/mkspecs/features/qt_functions.prf: -/usr/share/qt/mkspecs/features/qt_config.prf: -/usr/share/qt/mkspecs/features/exclusive_builds.prf: -/usr/share/qt/mkspecs/features/default_pre.prf: -/usr/share/qt/mkspecs/features/release.prf: -/usr/share/qt/mkspecs/features/default_post.prf: -/usr/share/qt/mkspecs/features/warn_on.prf: -/usr/share/qt/mkspecs/features/qt.prf: -/usr/share/qt/mkspecs/features/unix/thread.prf: -/usr/share/qt/mkspecs/features/moc.prf: -/usr/share/qt/mkspecs/features/resources.prf: -/usr/share/qt/mkspecs/features/uic.prf: -/usr/share/qt/mkspecs/features/yacc.prf: -/usr/share/qt/mkspecs/features/lex.prf: -/usr/share/qt/mkspecs/features/include_source_dir.prf: -/usr/lib/libQtGui.prl: -/usr/lib/libQtCore.prl: -qmake: FORCE - @$(QMAKE) -o Makefile ansifilter-gui.pro - -dist: - @$(CHK_DIR_EXISTS) .tmp/ansifilter-gui1.0.0 || $(MKDIR) .tmp/ansifilter-gui1.0.0 - $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/ansifilter-gui1.0.0/ && $(COPY_FILE) --parents mydialog.h .tmp/ansifilter-gui1.0.0/ && $(COPY_FILE) --parents main.cpp mydialog.cpp ../elementstyle.cpp ../plaintextgenerator.cpp ../codegenerator.cpp ../platform_fs.cpp ../rtfgenerator.cpp ../htmlgenerator.cpp ../texgenerator.cpp ../latexgenerator.cpp ../bbcodegenerator.cpp ../stringtools.cpp ../stylecolour.cpp ../preformatter.cpp .tmp/ansifilter-gui1.0.0/ && $(COPY_FILE) --parents ansifilter.ui .tmp/ansifilter-gui1.0.0/ && (cd `dirname .tmp/ansifilter-gui1.0.0` && $(TAR) ansifilter-gui1.0.0.tar ansifilter-gui1.0.0 && $(COMPRESS) ansifilter-gui1.0.0.tar) && $(MOVE) `dirname .tmp/ansifilter-gui1.0.0`/ansifilter-gui1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/ansifilter-gui1.0.0 - - -clean:compiler_clean - -$(DEL_FILE) $(OBJECTS) - -$(DEL_FILE) *~ core *.core - - -####### Sub-libraries - -distclean: clean - -$(DEL_FILE) $(TARGET) - -$(DEL_FILE) Makefile - - -check: first - -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: moc_mydialog.cpp -compiler_moc_header_clean: - -$(DEL_FILE) moc_mydialog.cpp -moc_mydialog.cpp: ui_ansifilter.h \ - mydialog.h - /usr/bin/moc $(DEFINES) $(INCPATH) mydialog.h -o moc_mydialog.cpp - -compiler_rcc_make_all: -compiler_rcc_clean: -compiler_image_collection_make_all: qmake_image_collection.cpp -compiler_image_collection_clean: - -$(DEL_FILE) qmake_image_collection.cpp -compiler_moc_source_make_all: -compiler_moc_source_clean: -compiler_uic_make_all: ui_ansifilter.h -compiler_uic_clean: - -$(DEL_FILE) ui_ansifilter.h -ui_ansifilter.h: ansifilter.ui - /usr/bin/uic ansifilter.ui -o ui_ansifilter.h - -compiler_yacc_decl_make_all: -compiler_yacc_decl_clean: -compiler_yacc_impl_make_all: -compiler_yacc_impl_clean: -compiler_lex_make_all: -compiler_lex_clean: -compiler_clean: compiler_moc_header_clean compiler_uic_clean - -####### Compile - -main.o: main.cpp mydialog.h \ - ui_ansifilter.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp - -mydialog.o: mydialog.cpp mydialog.h \ - ui_ansifilter.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o mydialog.o mydialog.cpp - -elementstyle.o: ../elementstyle.cpp ../elementstyle.h \ - ../stylecolour.h \ - ../enums.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o elementstyle.o ../elementstyle.cpp - -plaintextgenerator.o: ../plaintextgenerator.cpp ../plaintextgenerator.h \ - ../codegenerator.h \ - ../elementstyle.h \ - ../stylecolour.h \ - ../enums.h \ - ../preformatter.h \ - ../stringtools.h \ - ../version.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o plaintextgenerator.o ../plaintextgenerator.cpp - -codegenerator.o: ../codegenerator.cpp ../codegenerator.h \ - ../elementstyle.h \ - ../stylecolour.h \ - ../enums.h \ - ../preformatter.h \ - ../stringtools.h \ - ../version.h \ - ../htmlgenerator.h \ - ../rtfgenerator.h \ - ../plaintextgenerator.h \ - ../texgenerator.h \ - ../latexgenerator.h \ - ../bbcodegenerator.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o codegenerator.o ../codegenerator.cpp - -platform_fs.o: ../platform_fs.cpp ../platform_fs.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o platform_fs.o ../platform_fs.cpp - -rtfgenerator.o: ../rtfgenerator.cpp ../charcodes.h \ - ../version.h \ - ../rtfgenerator.h \ - ../codegenerator.h \ - ../elementstyle.h \ - ../stylecolour.h \ - ../enums.h \ - ../preformatter.h \ - ../stringtools.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o rtfgenerator.o ../rtfgenerator.cpp - -htmlgenerator.o: ../htmlgenerator.cpp ../htmlgenerator.h \ - ../codegenerator.h \ - ../elementstyle.h \ - ../stylecolour.h \ - ../enums.h \ - ../preformatter.h \ - ../stringtools.h \ - ../version.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o htmlgenerator.o ../htmlgenerator.cpp - -texgenerator.o: ../texgenerator.cpp ../texgenerator.h \ - ../codegenerator.h \ - ../elementstyle.h \ - ../stylecolour.h \ - ../enums.h \ - ../preformatter.h \ - ../stringtools.h \ - ../charcodes.h \ - ../version.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o texgenerator.o ../texgenerator.cpp - -latexgenerator.o: ../latexgenerator.cpp ../latexgenerator.h \ - ../codegenerator.h \ - ../elementstyle.h \ - ../stylecolour.h \ - ../enums.h \ - ../preformatter.h \ - ../stringtools.h \ - ../version.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o latexgenerator.o ../latexgenerator.cpp - -bbcodegenerator.o: ../bbcodegenerator.cpp ../bbcodegenerator.h \ - ../codegenerator.h \ - ../elementstyle.h \ - ../stylecolour.h \ - ../enums.h \ - ../preformatter.h \ - ../stringtools.h \ - ../version.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o bbcodegenerator.o ../bbcodegenerator.cpp - -stringtools.o: ../stringtools.cpp ../stringtools.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o stringtools.o ../stringtools.cpp - -stylecolour.o: ../stylecolour.cpp ../stylecolour.h \ - ../enums.h \ - ../stringtools.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o stylecolour.o ../stylecolour.cpp - -preformatter.o: ../preformatter.cpp ../preformatter.h \ - ../stringtools.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o preformatter.o ../preformatter.cpp - -moc_mydialog.o: moc_mydialog.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_mydialog.o moc_mydialog.cpp - -####### Install - -install: FORCE - -uninstall: FORCE - -FORCE: -