From e1f2f09bf994689dcad63817ae49988bc03db77f Mon Sep 17 00:00:00 2001 From: SeokYeon Hwang Date: Wed, 16 Sep 2015 13:52:03 +0900 Subject: [PATCH] Makefile: remove unnecessary rules ".o" from ".cpp" is already defined in "rules.mak". Change-Id: I2943d1a2674618e8c684290c476029d649c3149c Signed-off-by: SeokYeon Hwang --- tizen/src/ui/Makefile.objs | 7 ------- tizen/src/ui/controller/Makefile.objs | 4 +--- tizen/src/ui/input/Makefile.objs | 3 +-- tizen/src/ui/menu/Makefile.objs | 5 ----- 4 files changed, 2 insertions(+), 17 deletions(-) diff --git a/tizen/src/ui/Makefile.objs b/tizen/src/ui/Makefile.objs index bfc6159..8308941 100644 --- a/tizen/src/ui/Makefile.objs +++ b/tizen/src/ui/Makefile.objs @@ -5,7 +5,6 @@ obj-$(CONFIG_QT) += qt5.o obj-$(CONFIG_QT) += qt5_supplement.o obj-$(CONFIG_QT) += xmllayoutparser.o -$(obj)/qrc_resource.o: $(obj)/qrc_resource.cpp $(obj)/qrc_resource.cpp: $(TIZEN_UI)/resource/resource.qrc rcc -name resource $< -o $@ @@ -30,21 +29,15 @@ obj-$(CONFIG_QT) += input/ obj-$(CONFIG_QT) += layout/ obj-$(CONFIG_QT) += menu/ -$(obj)/moc_displayglwidget.o: $(obj)/moc_displayglwidget.cpp $(obj)/moc_displayglwidget.cpp: $(obj)/displayglwidget.h moc $< -o $@ -$(obj)/moc_displayswwidget.o: $(obj)/moc_displayswwidget.cpp $(obj)/moc_displayswwidget.cpp: $(obj)/displayswwidget.h moc $< -o $@ -$(obj)/moc_displayswapper.o: $(obj)/moc_displayswapper.cpp $(obj)/moc_displayswapper.cpp: $(obj)/displayswapper.h moc $< -o $@ -$(obj)/moc_mainwindow.o: $(obj)/moc_mainwindow.cpp $(obj)/moc_mainwindow.cpp: $(obj)/mainwindow.h moc $< -o $@ -$(obj)/moc_skinkeyitem.o: $(obj)/moc_skinkeyitem.cpp $(obj)/moc_skinkeyitem.cpp: $(obj)/skinkeyitem.h moc $< -o $@ -$(obj)/moc_rotaryview.o: $(obj)/moc_rotaryview.cpp $(obj)/moc_rotaryview.cpp: $(obj)/rotaryview.h moc $< -o $@ diff --git a/tizen/src/ui/controller/Makefile.objs b/tizen/src/ui/controller/Makefile.objs index 3cfc9ff..90e9a69 100644 --- a/tizen/src/ui/controller/Makefile.objs +++ b/tizen/src/ui/controller/Makefile.objs @@ -5,9 +5,7 @@ obj-$(CONFIG_QT) += floatingconview.o obj-$(CONFIG_QT) += generalpurposecon.o obj-$(CONFIG_QT) += hwkeybutton.o -$(obj)/moc_dockingcontroller.o: $(obj)/moc_dockingcontroller.cpp $(obj)/moc_dockingcontroller.cpp: $(obj)/dockingcontroller.h moc $< -o $@ -$(obj)/moc_floatingcontroller.o: $(obj)/moc_floatingcontroller.cpp $(obj)/moc_floatingcontroller.cpp: $(obj)/floatingcontroller.h - moc $< -o $@ \ No newline at end of file + moc $< -o $@ diff --git a/tizen/src/ui/input/Makefile.objs b/tizen/src/ui/input/Makefile.objs index 2b953a4..5316f1c 100644 --- a/tizen/src/ui/input/Makefile.objs +++ b/tizen/src/ui/input/Makefile.objs @@ -3,6 +3,5 @@ obj-$(CONFIG_QT) += multitouchtracker.o obj-$(CONFIG_QT) += keyboardhelper.o obj-$(CONFIG_QT) += keyboardshortcut.o moc_keyboardshortcut.o -$(obj)/moc_keyboardshortcut.o: $(obj)/moc_keyboardshortcut.cpp $(obj)/moc_keyboardshortcut.cpp: $(obj)/keyboardshortcut.h - moc $< -o $@ \ No newline at end of file + moc $< -o $@ diff --git a/tizen/src/ui/menu/Makefile.objs b/tizen/src/ui/menu/Makefile.objs index 34e357d..f01325a 100644 --- a/tizen/src/ui/menu/Makefile.objs +++ b/tizen/src/ui/menu/Makefile.objs @@ -7,13 +7,10 @@ obj-$(CONFIG_QT) += scalemenuitem.o obj-$(CONFIG_QT) += screenshotview.o obj-$(CONFIG_QT) += shellopener.o -$(obj)/moc_detailedinfodialog.o: $(obj)/moc_detailedinfodialog.cpp $(obj)/moc_detailedinfodialog.cpp: $(obj)/detailedinfodialog.h moc $< -o $@ -$(obj)/moc_contextmenu.o: $(obj)/moc_contextmenu.cpp $(obj)/moc_contextmenu.cpp: $(obj)/contextmenu.h moc $< -o $@ -$(obj)/moc_screenshotdialog.o: $(obj)/moc_screenshotdialog.cpp $(obj)/moc_screenshotdialog.cpp: $(obj)/screenshotdialog.h moc $< -o $@ @@ -21,12 +18,10 @@ $(obj)/moc_screenshotdialog.cpp: $(obj)/screenshotdialog.h ifdef CONFIG_EXTENSION_PATH EXT_SRC_PATH=../../../../../src/ui/menu obj-$(CONFIG_QT) += $(EXT_SRC_PATH)/aboutdialog.o moc_aboutdialog.o -$(obj)/moc_aboutdialog.o: $(obj)/moc_aboutdialog.cpp $(obj)/moc_aboutdialog.cpp: $(obj)/$(EXT_SRC_PATH)/aboutdialog.h moc $< -o $@ else obj-$(CONFIG_QT) += aboutdialog.o moc_aboutdialog.o -$(obj)/moc_aboutdialog.o: $(obj)/moc_aboutdialog.cpp $(obj)/moc_aboutdialog.cpp: $(obj)/aboutdialog.h moc $< -o $@ endif -- 2.7.4