From 5ea57d78c4c42551fcf57d423b13a0897f7db980 Mon Sep 17 00:00:00 2001 From: Niklas Date: Mon, 5 Sep 2011 17:04:22 +0200 Subject: tried to manage cmake but failed. also tried to add the del_route() method of interface.c but failed too. made a static lib of the customdhcpcd files but couldn't change it to a shared lib. (tried to add SHARE to the add_library code but this resulted in an error multiple declarations of main... --- LogReceiver/Makefile | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) (limited to 'LogReceiver/Makefile') diff --git a/LogReceiver/Makefile b/LogReceiver/Makefile index 0ba1fe1..c0e470d 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: Fri Sep 2 14:15:11 2011 +# Generated by qmake (2.01a) (Qt 4.7.2) on: Mon Sep 5 16:52:29 2011 # Project: LogReceiver.pro # Template: app # Command: /usr/local/Trolltech/QtEmbedded-4.7.2/bin/qmake -o Makefile LogReceiver.pro @@ -43,22 +43,26 @@ OBJECTS_DIR = ./ ####### Files -SOURCES = interfaceconfiguration.cpp \ +SOURCES = routemanager.cpp \ + interfaceconfiguration.cpp \ ndgui.cpp \ main.cpp \ logreceiver.cpp \ abortbootdialog.cpp \ - chooseinterfacedialog.cpp moc_interfaceconfiguration.cpp \ + chooseinterfacedialog.cpp moc_routemanager.cpp \ + moc_interfaceconfiguration.cpp \ moc_ndgui.cpp \ moc_logreceiver.cpp \ moc_abortbootdialog.cpp \ moc_chooseinterfacedialog.cpp -OBJECTS = interfaceconfiguration.o \ +OBJECTS = routemanager.o \ + interfaceconfiguration.o \ ndgui.o \ main.o \ logreceiver.o \ abortbootdialog.o \ chooseinterfacedialog.o \ + moc_routemanager.o \ moc_interfaceconfiguration.o \ moc_ndgui.o \ moc_logreceiver.o \ @@ -171,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 interfaceconfiguration.h ndgui.h logreceiver.h abortbootdialog.h chooseinterfacedialog.h .tmp/LogReceiver1.0.0/ && $(COPY_FILE) --parents 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 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 clean:compiler_clean @@ -192,9 +196,12 @@ 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_interfaceconfiguration.cpp moc_ndgui.cpp moc_logreceiver.cpp moc_abortbootdialog.cpp moc_chooseinterfacedialog.cpp +compiler_moc_header_make_all: moc_routemanager.cpp moc_interfaceconfiguration.cpp moc_ndgui.cpp moc_logreceiver.cpp moc_abortbootdialog.cpp moc_chooseinterfacedialog.cpp compiler_moc_header_clean: - -$(DEL_FILE) moc_interfaceconfiguration.cpp moc_ndgui.cpp moc_logreceiver.cpp moc_abortbootdialog.cpp moc_chooseinterfacedialog.cpp + -$(DEL_FILE) moc_routemanager.cpp moc_interfaceconfiguration.cpp moc_ndgui.cpp moc_logreceiver.cpp moc_abortbootdialog.cpp moc_chooseinterfacedialog.cpp +moc_routemanager.cpp: routemanager.h + /usr/local/Trolltech/QtEmbedded-4.7.2/bin/moc $(DEFINES) $(INCPATH) routemanager.h -o moc_routemanager.cpp + moc_interfaceconfiguration.cpp: interfaceconfiguration.h /usr/local/Trolltech/QtEmbedded-4.7.2/bin/moc $(DEFINES) $(INCPATH) interfaceconfiguration.h -o moc_interfaceconfiguration.cpp @@ -240,6 +247,9 @@ compiler_clean: compiler_moc_header_clean compiler_uic_clean ####### Compile +routemanager.o: routemanager.cpp routemanager.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o routemanager.o routemanager.cpp + interfaceconfiguration.o: interfaceconfiguration.cpp interfaceconfiguration.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o interfaceconfiguration.o interfaceconfiguration.cpp @@ -257,7 +267,9 @@ main.o: main.cpp ndgui.h \ abortbootdialog.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp -logreceiver.o: logreceiver.cpp logreceiver.h +logreceiver.o: logreceiver.cpp logreceiver.h \ + interfaceconfiguration.h \ + ../common/fbgui.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o logreceiver.o logreceiver.cpp abortbootdialog.o: abortbootdialog.cpp abortbootdialog.h @@ -266,6 +278,9 @@ abortbootdialog.o: abortbootdialog.cpp abortbootdialog.h chooseinterfacedialog.o: chooseinterfacedialog.cpp chooseinterfacedialog.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o chooseinterfacedialog.o chooseinterfacedialog.cpp +moc_routemanager.o: moc_routemanager.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_routemanager.o moc_routemanager.cpp + moc_interfaceconfiguration.o: moc_interfaceconfiguration.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_interfaceconfiguration.o moc_interfaceconfiguration.cpp -- cgit v1.2.3-55-g7522