diff options
| author | Ted Gould <ted@gould.cx> | 2010-01-01 04:30:23 +0000 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-01-01 04:30:23 +0000 |
| commit | e588e1f405fa74d8e14735172570f1a542513625 (patch) | |
| tree | 59837b450e0eb6bb41817820a19d7aa3387b879c | |
| parent | Cleaning up the Makefile so it's easier to read (diff) | |
| download | inkscape-e588e1f405fa74d8e14735172570f1a542513625.tar.gz inkscape-e588e1f405fa74d8e14735172570f1a542513625.zip | |
Adding all of the library stuff in. Including libtool in configure and libtoolize in autogen.sh
(bzr r8254.1.46)
| -rwxr-xr-x | autogen.sh | 3 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/extension/dbus/Makefile_insert | 28 |
3 files changed, 31 insertions, 1 deletions
diff --git a/autogen.sh b/autogen.sh index 6a7c6317b..eedf7f23c 100755 --- a/autogen.sh +++ b/autogen.sh @@ -152,7 +152,7 @@ test $TEST_TYPE $FILE || { if test -z "$ACLOCAL_FLAGS"; then acdir=`$ACLOCAL --print-ac-dir` - m4list="glib-2.0.m4 glib-gettext.m4 gtk-2.0.m4 intltool.m4 pkg.m4" + m4list="glib-2.0.m4 glib-gettext.m4 gtk-2.0.m4 intltool.m4 pkg.m4 libtool.m4" for file in $m4list do @@ -179,6 +179,7 @@ attempt_command 'underquoted definition of|[\)\#]Extending' \ attempt_command '' autoheader } +attempt_command '' libtoolize attempt_command '' $AUTOMAKE --copy --force --add-missing attempt_command '' autoconf attempt_command '^(Please add the files| codeset| progtest|from the|or directly|You will also|ftp://ftp.gnu.org|$)' \ diff --git a/configure.ac b/configure.ac index 6d673ca0d..5ef78b227 100644 --- a/configure.ac +++ b/configure.ac @@ -30,6 +30,7 @@ AM_PROG_CC_STDC AM_PROG_AS AC_PROG_RANLIB AC_PROG_INTLTOOL(0.22) +AC_PROG_LIBTOOL AC_HEADER_STDC INK_SVN_SNAPSHOT_BUILD diff --git a/src/extension/dbus/Makefile_insert b/src/extension/dbus/Makefile_insert index 65ead8c93..aa4d17f22 100644 --- a/src/extension/dbus/Makefile_insert +++ b/src/extension/dbus/Makefile_insert @@ -51,3 +51,31 @@ service_DATA = $(service_in_files:.service.in=.service) $(service_DATA): $(service_in_files) Makefile @sed -e "s|bindir|$(prefix)|" $<> $@ +############################ +# DBus Interface Helper Lib +############################ + +lib_LTLIBRARIES = \ + libinkdbus.la + +libinkdbusincludedir = $(includedir)/libinkdbus-0.48/libinkdbus +libinkdbusinclude_HEADERS = \ + extension/dbus/wrapper/inkscape-dbus-wrapper.h + +libinkdbus_la_SOURCES = \ + extension/dbus/wrapper/inkscape-dbus-wrapper.h \ + extension/dbus/wrapper/inkscape-dbus-wrapper.c + +libinkdbus_la_LDFLAGS = \ + -version-info 0:0:0 \ + -no-undefined \ + -export-symbols-regex "^[^_d].*" + +libinkdbus_la_CFLAGS = \ + $(DBUS_CFLAGS) \ + $(INKSCAPE_CFLAGS) \ + -Wall -Werror + +libinkdbus_la_LIBADD = \ + $(DBUS_LIBS) \ + $(INKSCAPE_LIBS) |