From f2c6d5d244221677a2318fde19e9210e1ba31cb0 Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Fri, 3 Nov 2006 19:11:22 +0000 Subject: [PATCH] fix Makefile --- linux/Makefile.am | 112 +++++++++++++++++++++++----------------------- 1 file changed, 56 insertions(+), 56 deletions(-) diff --git a/linux/Makefile.am b/linux/Makefile.am index 2bcfe078..05b6e7fe 100755 --- a/linux/Makefile.am +++ b/linux/Makefile.am @@ -8,14 +8,14 @@ llcon_SOURCES = ../src/buffer.cpp \ ../src/resample.cpp \ ../src/channel.cpp \ ../src/util.cpp \ - ../src/llconclientdlg.cpp \ + ../src/llconclientdlg.cpp \ ../src/clientsettingsdlg.cpp \ ../src/client.cpp \ ../src/llconserverdlg.cpp \ - ../src/server.cpp \ + ../src/server.cpp \ ../src/settings.cpp \ - ../src/protocol.cpp \ - ../src/multicolorled.cpp \ + ../src/protocol.cpp \ + ../src/multicolorled.cpp \ sound.cpp \ ../src/buffer.h \ ../src/global.h \ @@ -26,31 +26,31 @@ llcon_SOURCES = ../src/buffer.cpp \ ../src/channel.h \ ../src/util.h \ ../src/client.h \ - ../src/server.h \ - ../src/settings.h \ - ../src/protocol.h \ - ../src/multicolorled.h \ - ../src/llconserverdlg.h \ - ../src/llconclientdlg.h \ + ../src/server.h \ + ../src/settings.h \ + ../src/protocol.h \ + ../src/multicolorled.h \ + ../src/llconserverdlg.h \ + ../src/llconclientdlg.h \ ../src/clientsettingsdlg.h \ - ../src/llconclientdlgbase.ui \ - ../src/llconserverdlgbase.ui \ + ../src/llconclientdlgbase.ui \ + ../src/llconserverdlgbase.ui \ ../src/aboutdlgbase.ui \ sound.h # these need to be generated before the rest can be compiled -BUILT_SOURCES=moc/moc_server.cpp \ - moc/moc_client.cpp \ - moc/moc_protocol.cpp \ +BUILT_SOURCES=moc/moc_server.cpp \ + moc/moc_client.cpp \ + moc/moc_protocol.cpp \ moc/moc_channel.cpp \ moc/moc_socket.cpp \ moc/moc_multicolorled.cpp \ - moc/moc_util.cpp \ + moc/moc_util.cpp \ moc/moc_llconclientdlg.cpp moc/moc_llconclientdlgbase.cpp moc/llconclientdlgbase.h moc/llconclientdlgbase.cpp \ - moc/moc_clientsettingsdlg.cpp moc/moc_clientsettingsdlgbase.cpp moc/clientsettingsdlgbase.h moc/clientsettingsdlgbase.cpp \ + moc/moc_clientsettingsdlg.cpp moc/moc_clientsettingsdlgbase.cpp moc/clientsettingsdlgbase.h moc/clientsettingsdlgbase.cpp \ moc/moc_llconserverdlg.cpp moc/moc_llconserverdlgbase.cpp moc/llconserverdlgbase.h moc/llconserverdlgbase.cpp \ - moc/moc_aboutdlgbase.cpp moc/aboutdlgbase.h moc/aboutdlgbase.cpp + moc/moc_aboutdlgbase.cpp moc/aboutdlgbase.h moc/aboutdlgbase.cpp # and should be cleaned by make clean @@ -61,9 +61,9 @@ dist-hook: mkdir $(distdir)/moc moc/moc_server.cpp: ../src/server.h - $(MOC) ../src/server.h -o moc/moc_server.cpp - -moc/moc_client.cpp: ../src/client.h + $(MOC) ../src/server.h -o moc/moc_server.cpp + +moc/moc_client.cpp: ../src/client.h $(MOC) ../src/client.h -o moc/moc_client.cpp moc/moc_socket.cpp: ../src/socket.h @@ -71,27 +71,27 @@ moc/moc_socket.cpp: ../src/socket.h moc/moc_multicolorled.cpp: ../src/multicolorled.h $(MOC) ../src/multicolorled.h -o moc/moc_multicolorled.cpp - -moc/moc_util.cpp: ../src/util.h - $(MOC) ../src/util.h -o moc/moc_util.cpp - -moc/moc_protocol.cpp: ../src/protocol.h - $(MOC) ../src/protocol.h -o moc/moc_protocol.cpp - -moc/moc_channel.cpp: ../src/channel.h - $(MOC) ../src/channel.h -o moc/moc_channel.cpp - - -moc/moc_aboutdlgbase.cpp: moc/aboutdlgbase.h - $(MOC) moc/aboutdlgbase.h -o moc/moc_aboutdlgbase.cpp - -moc/aboutdlgbase.h: ../src/aboutdlgbase.ui - $(UIC) ../src/aboutdlgbase.ui -o moc/aboutdlgbase.h - -moc/aboutdlgbase.cpp: ../src/aboutdlgbase.ui moc/aboutdlgbase.h - $(UIC) ../src/aboutdlgbase.ui -i moc/aboutdlgbase.h -o moc/aboutdlgbase.cpp - - + +moc/moc_util.cpp: ../src/util.h + $(MOC) ../src/util.h -o moc/moc_util.cpp + +moc/moc_protocol.cpp: ../src/protocol.h + $(MOC) ../src/protocol.h -o moc/moc_protocol.cpp + +moc/moc_channel.cpp: ../src/channel.h + $(MOC) ../src/channel.h -o moc/moc_channel.cpp + + +moc/moc_aboutdlgbase.cpp: moc/aboutdlgbase.h + $(MOC) moc/aboutdlgbase.h -o moc/moc_aboutdlgbase.cpp + +moc/aboutdlgbase.h: ../src/aboutdlgbase.ui + $(UIC) ../src/aboutdlgbase.ui -o moc/aboutdlgbase.h + +moc/aboutdlgbase.cpp: ../src/aboutdlgbase.ui moc/aboutdlgbase.h + $(UIC) ../src/aboutdlgbase.ui -i moc/aboutdlgbase.h -o moc/aboutdlgbase.cpp + + moc/moc_llconclientdlg.cpp: ../src/llconclientdlg.h $(MOC) ../src/llconclientdlg.h -o moc/moc_llconclientdlg.cpp @@ -103,20 +103,20 @@ moc/llconclientdlgbase.h: ../src/llconclientdlgbase.ui moc/llconclientdlgbase.cpp: ../src/llconclientdlgbase.ui moc/llconclientdlgbase.h $(UIC) ../src/llconclientdlgbase.ui -i moc/llconclientdlgbase.h -o moc/llconclientdlgbase.cpp - - -moc/moc_clientsettingsdlg.cpp: ../src/clientsettingsdlg.h - $(MOC) ../src/clientsettingsdlg.h -o moc/moc_clientsettingsdlg.cpp - -moc/moc_clientsettingsdlgbase.cpp: moc/clientsettingsdlgbase.h - $(MOC) moc/clientsettingsdlgbase.h -o moc/moc_clientsettingsdlgbase.cpp - -moc/clientsettingsdlgbase.h: ../src/clientsettingsdlgbase.ui - $(UIC) ../src/clientsettingsdlgbase.ui -o moc/clientsettingsdlgbase.h - -moc/clientsettingsdlgbase.cpp: ../src/clientsettingsdlgbase.ui moc/clientsettingsdlgbase.h - $(UIC) ../src/clientsettingsdlgbase.ui -i moc/clientsettingsdlgbase.h -o moc/clientsettingsdlgbase.cpp - + + +moc/moc_clientsettingsdlg.cpp: ../src/clientsettingsdlg.h + $(MOC) ../src/clientsettingsdlg.h -o moc/moc_clientsettingsdlg.cpp + +moc/moc_clientsettingsdlgbase.cpp: moc/clientsettingsdlgbase.h + $(MOC) moc/clientsettingsdlgbase.h -o moc/moc_clientsettingsdlgbase.cpp + +moc/clientsettingsdlgbase.h: ../src/clientsettingsdlgbase.ui + $(UIC) ../src/clientsettingsdlgbase.ui -o moc/clientsettingsdlgbase.h + +moc/clientsettingsdlgbase.cpp: ../src/clientsettingsdlgbase.ui moc/clientsettingsdlgbase.h + $(UIC) ../src/clientsettingsdlgbase.ui -i moc/clientsettingsdlgbase.h -o moc/clientsettingsdlgbase.cpp + moc/moc_llconserverdlg.cpp: ../src/llconserverdlg.h $(MOC) ../src/llconserverdlg.h -o moc/moc_llconserverdlg.cpp