From 9fc1e9959c35678ef964052ead1a41b4c06176b1 Mon Sep 17 00:00:00 2001 From: Julien Bonjean <julien@bonjean.info> Date: Mon, 2 Mar 2009 17:15:52 -0500 Subject: [PATCH] Cleaned and fixed makefile --- sflphone-gtk/autogen.sh | 2 +- sflphone-gtk/src/Makefile.am | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/sflphone-gtk/autogen.sh b/sflphone-gtk/autogen.sh index 803a1712c8..68c1e41e81 100755 --- a/sflphone-gtk/autogen.sh +++ b/sflphone-gtk/autogen.sh @@ -10,6 +10,6 @@ libtoolize --force autoheader autoconf -f automake -a -#./configure $@ +./configure $@ diff --git a/sflphone-gtk/src/Makefile.am b/sflphone-gtk/src/Makefile.am index 4554b59bb8..ae05598de2 100644 --- a/sflphone-gtk/src/Makefile.am +++ b/sflphone-gtk/src/Makefile.am @@ -2,7 +2,7 @@ bin_PROGRAMS = sflphone-gtk SUBDIRS=contactlist -noinst_LTLIBRARIES = libsflphonegtk.la +# noinst_LTLIBRARIES = libsflphonegtk.la NOFIFY_LIBS=-lnotify SEXY_LIBS=-lsexy @@ -47,10 +47,8 @@ noinst_HEADERS = actions.h dbus.h sflnotify.h mainwindow.h calllist.h dialpad.h EXTRA_DIST = marshaller.list sflphone_gtk_LDADD = $(DEPS_LIBS) $(NOTIFY_LIBS) $(SEXY_LIBS) \ - ./libsflphonegtk.la + ./contactlist/libcontact.la -libsflphonegtk_la_LIBADD = \ - contactlist/libcontact.la AM_CPPFLAGS = $(DEPS_CFLAGS) \ -DICONS_DIR=\""$(prefix)/share/sflphone"\" \ -- GitLab