projects
/
platform
/
upstream
/
connman.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2839a2d
)
Fix some plugin build system details
author
Marcel Holtmann
<marcel@holtmann.org>
Thu, 9 Jul 2009 02:28:57 +0000
(19:28 -0700)
committer
Marcel Holtmann
<marcel@holtmann.org>
Thu, 9 Jul 2009 02:28:57 +0000
(19:28 -0700)
plugins/Makefile.am
patch
|
blob
|
history
diff --git
a/plugins/Makefile.am
b/plugins/Makefile.am
index
2b92b07
..
4cb8c93
100644
(file)
--- a/
plugins/Makefile.am
+++ b/
plugins/Makefile.am
@@
-23,7
+23,6
@@
builtin_modules += ethernet
builtin_sources += ethernet.c
else
plugin_LTLIBRARIES += ethernet.la
builtin_sources += ethernet.c
else
plugin_LTLIBRARIES += ethernet.la
-ethernet_la_SOURCES = ethernet.c
endif
endif
endif
endif
@@
-44,7
+43,6
@@
builtin_modules += bluetooth
builtin_sources += bluetooth.c
else
plugin_LTLIBRARIES += bluetooth.la
builtin_sources += bluetooth.c
else
plugin_LTLIBRARIES += bluetooth.la
-bluetooth_la_SOURCES = bluetooth.c
bluetooth_la_LIBADD = @GDBUS_LIBS@
endif
endif
bluetooth_la_LIBADD = @GDBUS_LIBS@
endif
endif
@@
-55,7
+53,7
@@
builtin_modules += ofono
builtin_sources += ofono.c
else
plugin_LTLIBRARIES += ofono.la
builtin_sources += ofono.c
else
plugin_LTLIBRARIES += ofono.la
-
bluetooth
_la_LIBADD = @GDBUS_LIBS@
+
ofono
_la_LIBADD = @GDBUS_LIBS@
endif
endif
endif
endif
@@
-101,7
+99,6
@@
builtin_libadd += @GATCHAT_LIBS@
builtin_cflags += @GATCHAT_CFLAGS@
else
plugin_LTLIBRARIES += mbm.la
builtin_cflags += @GATCHAT_CFLAGS@
else
plugin_LTLIBRARIES += mbm.la
-mbm_la_SOURCES = mbm.c
mbm_la_LIBADD = @GATCHAT_LIBS@
mbm_la_CFLAGS = $(AM_CFLAGS) @GATCHAT_CFLAGS@
endif
mbm_la_LIBADD = @GATCHAT_LIBS@
mbm_la_CFLAGS = $(AM_CFLAGS) @GATCHAT_CFLAGS@
endif
@@
-127,7
+124,6
@@
builtin_sources += dhclient.c
builtin_cflags += -DDHCLIENT=\"@DHCLIENT@\"
else
plugin_LTLIBRARIES += dhclient.la
builtin_cflags += -DDHCLIENT=\"@DHCLIENT@\"
else
plugin_LTLIBRARIES += dhclient.la
-dhclient_la_SOURCES = dhclient.c
dhclient_la_CFLAGS = $(AM_CFLAGS) -DDHCLIENT=\"@DHCLIENT@\" \
-DSTATEDIR=\""$(statedir)"\" -DSCRIPTDIR=\""$(scriptdir)"\"
endif
dhclient_la_CFLAGS = $(AM_CFLAGS) -DDHCLIENT=\"@DHCLIENT@\" \
-DSTATEDIR=\""$(statedir)"\" -DSCRIPTDIR=\""$(scriptdir)"\"
endif