diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2008-01-07 06:13:04 +0100 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2008-01-07 06:13:04 +0100 |
| commit | 2ab94f9d3f5b40470b337044de77b37e6d84e098 (patch) | |
| tree | 9b2fabbb531d733852fcb66d1839fcb1ce17b825 | |
| parent | 848fc55d83e721f73b0401d7328f7a1bcf574247 (diff) | |
| download | connman-gnome-2ab94f9d3f5b40470b337044de77b37e6d84e098.tar.gz | |
Add skeleton for common helper library
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | applet/Makefile.am | 5 | ||||
| -rw-r--r-- | common/Makefile.am | 8 | ||||
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | properties/Makefile.am | 5 |
5 files changed, 19 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index ff64e8d..464c72b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ -SUBDIRS = po icons applet properties +SUBDIRS = po icons common applet properties EXTRA_DIST = intltool-extract.in intltool-update.in intltool-merge.in diff --git a/applet/Makefile.am b/applet/Makefile.am index 60a5772..cb99375 100644 --- a/applet/Makefile.am +++ b/applet/Makefile.am @@ -3,7 +3,8 @@ bin_PROGRAMS = connman-applet connman_applet_SOURCES = main.c status.h status.c -connman_applet_LDADD = @GTK_LIBS@ @DBUS_LIBS@ +connman_applet_LDADD = $(top_builddir)/common/libcommon.a \ + @GTK_LIBS@ @DBUS_LIBS@ if MAINTAINER_MODE icondir = $(abs_top_srcdir)/icons @@ -13,6 +14,8 @@ endif AM_CFLAGS = @DBUS_CFLAGS@ @GTK_CFLAGS@ -DICONDIR=\""$(icondir)"\" +INCLUDES = -I$(top_srcdir)/common + autostartdir = $(sysconfdir)/xdg/autostart autostart_in_files = connman-applet.desktop.in diff --git a/common/Makefile.am b/common/Makefile.am new file mode 100644 index 0000000..b15a480 --- /dev/null +++ b/common/Makefile.am @@ -0,0 +1,8 @@ + +noinst_LIBRARIES = libcommon.a + +libcommon_a_SOURCES = + +AM_CFLAGS = @DBUS_CFLAGS@ @GTK_CFLAGS@ + +MAINTAINERCLEANFILES = Makefile.in diff --git a/configure.in b/configure.in index 8b10750..c571912 100644 --- a/configure.in +++ b/configure.in @@ -20,6 +20,7 @@ AC_LANG_C AC_PROG_CC AC_PROG_CC_PIE AC_PROG_INSTALL +AC_PROG_RANLIB GETTEXT_PACKAGE=connman AC_SUBST(GETTEXT_PACKAGE) @@ -39,5 +40,5 @@ PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.12, dummy=yes, AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) -AC_OUTPUT(Makefile applet/Makefile properties/Makefile +AC_OUTPUT(Makefile common/Makefile applet/Makefile properties/Makefile icons/Makefile po/Makefile.in) diff --git a/properties/Makefile.am b/properties/Makefile.am index 0d387ef..bbd9435 100644 --- a/properties/Makefile.am +++ b/properties/Makefile.am @@ -3,7 +3,8 @@ bin_PROGRAMS = connman-properties connman_properties_SOURCES = main.c -connman_properties_LDADD = @GTK_LIBS@ @DBUS_LIBS@ +connman_properties_LDADD = $(top_builddir)/common/libcommon.a \ + @GTK_LIBS@ @DBUS_LIBS@ if MAINTAINER_MODE icondir = $(abs_top_srcdir)/icons @@ -13,6 +14,8 @@ endif AM_CFLAGS = @DBUS_CFLAGS@ @GTK_CFLAGS@ -DICONDIR=\""$(icondir)"\" +INCLUDES = -I$(top_srcdir)/common + desktopdir = $(datadir)/applications desktop_in_files = connman-properties.desktop.in |