diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2005-11-01 16:56:45 +0000 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2005-11-01 16:56:45 +0000 |
| commit | fe8f6f45a86efb2d356c3084b7991b90d8f319ea (patch) | |
| tree | 92bdc34e409c5e85b76525688a89a59d8b22314e | |
| parent | 0443fc32d957c04964d6b875fbb203980b57775a (diff) | |
Move glib-ectomy.[ch] into the common directory
| -rw-r--r-- | common/Makefile.am | 4 | ||||
| -rw-r--r-- | common/glib-ectomy.c (renamed from hcid/glib-ectomy.c) | 0 | ||||
| -rw-r--r-- | common/glib-ectomy.h (renamed from hcid/glib-ectomy.h) | 0 | ||||
| -rw-r--r-- | hcid/Makefile.am | 8 |
4 files changed, 9 insertions, 3 deletions
diff --git a/common/Makefile.am b/common/Makefile.am index 71592813..5a5a4702 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -1,8 +1,10 @@ -noinst_LIBRARIES = libtextfile.a +noinst_LIBRARIES = libtextfile.a libglib-ectomy.a libtextfile_a_SOURCES = textfile.h textfile.c +libglib_ectomy_a_SOURCES = glib-ectomy.h glib-ectomy.c + noinst_PROGRAMS = test_textfile test_textfile_LDADD = libtextfile.a diff --git a/hcid/glib-ectomy.c b/common/glib-ectomy.c index bea7f47c..bea7f47c 100644 --- a/hcid/glib-ectomy.c +++ b/common/glib-ectomy.c diff --git a/hcid/glib-ectomy.h b/common/glib-ectomy.h index c507e3c7..c507e3c7 100644 --- a/hcid/glib-ectomy.h +++ b/common/glib-ectomy.h diff --git a/hcid/Makefile.am b/hcid/Makefile.am index e82a4263..856f6bb5 100644 --- a/hcid/Makefile.am +++ b/hcid/Makefile.am @@ -25,8 +25,12 @@ dbus_hcid_libs = dbus_hcid_cflags = endif -hcid_SOURCES = main.c security.c storage.c hcid.h lib.c lib.h parser.h parser.y lexer.l kword.h kword.c glib-ectomy.h glib-ectomy.c $(dbus_hcid_sources) -hcid_LDADD = $(dbus_hcid_libs) @BLUEZ_LIBS@ $(top_builddir)/common/libtextfile.a +hcid_SOURCES = main.c security.c storage.c hcid.h lib.c lib.h \ + parser.h parser.y lexer.l kword.h kword.c $(dbus_hcid_sources) + +hcid_LDADD = $(dbus_hcid_libs) @BLUEZ_LIBS@ \ + $(top_builddir)/common/libglib-ectomy.a \ + $(top_builddir)/common/libtextfile.a AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ $(dbus_hcid_cflags) |