From 8ac203bf967050cc07152ca4a002de6b5d5d26ff Mon Sep 17 00:00:00 2001 From: Niklas Date: Tue, 6 Sep 2011 17:15:01 +0200 Subject: latest version of all files. cmake still doesn't work --- LogReceiver/Makefile | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'LogReceiver/Makefile') diff --git a/LogReceiver/Makefile b/LogReceiver/Makefile index c0e470d..0f9536a 100644 --- a/LogReceiver/Makefile +++ b/LogReceiver/Makefile @@ -1,6 +1,6 @@ ############################################################################# # Makefile for building: LogReceiver -# Generated by qmake (2.01a) (Qt 4.7.2) on: Mon Sep 5 16:52:29 2011 +# Generated by qmake (2.01a) (Qt 4.7.2) on: Tue Sep 6 16:50:59 2011 # Project: LogReceiver.pro # Template: app # Command: /usr/local/Trolltech/QtEmbedded-4.7.2/bin/qmake -o Makefile LogReceiver.pro @@ -16,7 +16,7 @@ CXXFLAGS = -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES) INCPATH = -I/usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/qws/linux-x86-g++ -I. -I/usr/local/Trolltech/QtEmbedded-4.7.2/include/QtCore -I/usr/local/Trolltech/QtEmbedded-4.7.2/include/QtNetwork -I/usr/local/Trolltech/QtEmbedded-4.7.2/include/QtGui -I/usr/local/Trolltech/QtEmbedded-4.7.2/include -I../customdhcpcd/src -I. -I. LINK = g++ LFLAGS = -Wl,-O1 -Wl,-rpath,/usr/local/Trolltech/QtEmbedded-4.7.2/lib -LIBS = $(SUBLIBS) -L/usr/local/Trolltech/QtEmbedded-4.7.2/lib -lsysfs -lQtGui -L/usr/local/Trolltech/QtEmbedded-4.7.2/lib -lQtNetwork -lQtCore -lpthread +LIBS = $(SUBLIBS) -L/usr/local/Trolltech/QtEmbedded-4.7.2/lib -lsysfs -L/home/niklas/fbgui/customdhcpcd/src/build -llibcustomdhcpcd -lQtGui -L/usr/local/Trolltech/QtEmbedded-4.7.2/lib -lQtNetwork -lQtCore -lpthread AR = ar cqs RANLIB = QMAKE = /usr/local/Trolltech/QtEmbedded-4.7.2/bin/qmake @@ -118,7 +118,7 @@ first: all all: Makefile $(TARGET) -$(TARGET): ui_ndgui.h ui_logreceiver.h $(OBJECTS) +$(TARGET): ui_ndgui.h $(OBJECTS) $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) Makefile: LogReceiver.pro /usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/qws/linux-x86-g++/qmake.conf /usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/common/g++.conf \ @@ -175,7 +175,7 @@ qmake: FORCE dist: @$(CHK_DIR_EXISTS) .tmp/LogReceiver1.0.0 || $(MKDIR) .tmp/LogReceiver1.0.0 - $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/LogReceiver1.0.0/ && $(COPY_FILE) --parents routemanager.h interfaceconfiguration.h ndgui.h logreceiver.h abortbootdialog.h chooseinterfacedialog.h .tmp/LogReceiver1.0.0/ && $(COPY_FILE) --parents routemanager.cpp interfaceconfiguration.cpp ndgui.cpp main.cpp logreceiver.cpp abortbootdialog.cpp chooseinterfacedialog.cpp .tmp/LogReceiver1.0.0/ && $(COPY_FILE) --parents ndgui.ui logreceiver.ui .tmp/LogReceiver1.0.0/ && (cd `dirname .tmp/LogReceiver1.0.0` && $(TAR) LogReceiver1.0.0.tar LogReceiver1.0.0 && $(COMPRESS) LogReceiver1.0.0.tar) && $(MOVE) `dirname .tmp/LogReceiver1.0.0`/LogReceiver1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/LogReceiver1.0.0 + $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/LogReceiver1.0.0/ && $(COPY_FILE) --parents routemanager.h interfaceconfiguration.h ndgui.h logreceiver.h abortbootdialog.h chooseinterfacedialog.h .tmp/LogReceiver1.0.0/ && $(COPY_FILE) --parents routemanager.cpp interfaceconfiguration.cpp ndgui.cpp main.cpp logreceiver.cpp abortbootdialog.cpp chooseinterfacedialog.cpp .tmp/LogReceiver1.0.0/ && $(COPY_FILE) --parents ndgui.ui .tmp/LogReceiver1.0.0/ && (cd `dirname .tmp/LogReceiver1.0.0` && $(TAR) LogReceiver1.0.0.tar LogReceiver1.0.0 && $(COMPRESS) LogReceiver1.0.0.tar) && $(MOVE) `dirname .tmp/LogReceiver1.0.0`/LogReceiver1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/LogReceiver1.0.0 clean:compiler_clean @@ -207,12 +207,14 @@ moc_interfaceconfiguration.cpp: interfaceconfiguration.h moc_ndgui.cpp: ui_ndgui.h \ logreceiver.h \ + interfaceconfiguration.h \ chooseinterfacedialog.h \ abortbootdialog.h \ ndgui.h /usr/local/Trolltech/QtEmbedded-4.7.2/bin/moc $(DEFINES) $(INCPATH) ndgui.h -o moc_ndgui.cpp -moc_logreceiver.cpp: logreceiver.h +moc_logreceiver.cpp: interfaceconfiguration.h \ + logreceiver.h /usr/local/Trolltech/QtEmbedded-4.7.2/bin/moc $(DEFINES) $(INCPATH) logreceiver.h -o moc_logreceiver.cpp moc_abortbootdialog.cpp: abortbootdialog.h @@ -228,15 +230,12 @@ compiler_image_collection_clean: -$(DEL_FILE) qmake_image_collection.cpp compiler_moc_source_make_all: compiler_moc_source_clean: -compiler_uic_make_all: ui_ndgui.h ui_logreceiver.h +compiler_uic_make_all: ui_ndgui.h compiler_uic_clean: - -$(DEL_FILE) ui_ndgui.h ui_logreceiver.h + -$(DEL_FILE) ui_ndgui.h ui_ndgui.h: ndgui.ui /usr/local/Trolltech/QtEmbedded-4.7.2/bin/uic ndgui.ui -o ui_ndgui.h -ui_logreceiver.h: logreceiver.ui - /usr/local/Trolltech/QtEmbedded-4.7.2/bin/uic logreceiver.ui -o ui_logreceiver.h - compiler_yacc_decl_make_all: compiler_yacc_decl_clean: compiler_yacc_impl_make_all: @@ -256,6 +255,7 @@ interfaceconfiguration.o: interfaceconfiguration.cpp interfaceconfiguration.h ndgui.o: ndgui.cpp ndgui.h \ ui_ndgui.h \ logreceiver.h \ + interfaceconfiguration.h \ chooseinterfacedialog.h \ abortbootdialog.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ndgui.o ndgui.cpp @@ -263,6 +263,7 @@ ndgui.o: ndgui.cpp ndgui.h \ main.o: main.cpp ndgui.h \ ui_ndgui.h \ logreceiver.h \ + interfaceconfiguration.h \ chooseinterfacedialog.h \ abortbootdialog.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp -- cgit v1.2.3-55-g7522