diff options
| author | npmccallum <npmccallum@c587cffe-e639-0410-9787-d7902ae8ed56> | 2007-12-13 03:09:25 +0000 |
|---|---|---|
| committer | npmccallum <npmccallum@c587cffe-e639-0410-9787-d7902ae8ed56> | 2007-12-13 03:09:25 +0000 |
| commit | 9a0a9c62607efc7537e370659132160a1a79b406 (patch) | |
| tree | abb7ac896a2f41b0030c8c0ccfff26be4099a515 | |
| parent | f8a3d529f1d3e0cf1cab0556f6fdbca2ba1a9eed (diff) | |
| download | libproxy-9a0a9c62607efc7537e370659132160a1a79b406.tar.gz | |
Makefile changes to make distcheck work
git-svn-id: http://libproxy.googlecode.com/svn/trunk@99 c587cffe-e639-0410-9787-d7902ae8ed56
| -rw-r--r-- | src/bin/Makefile.am | 3 | ||||
| -rw-r--r-- | src/bindings/python/Makefile.am | 2 | ||||
| -rw-r--r-- | src/plugins/Makefile.am | 15 |
3 files changed, 11 insertions, 9 deletions
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am index 43959c9..c68366d 100644 --- a/src/bin/Makefile.am +++ b/src/bin/Makefile.am @@ -2,7 +2,6 @@ bin_PROGRAMS = proxy # Command line interface to libproxy proxy_SOURCES = proxy.c -proxy_CFLAGS = -I../lib +proxy_CFLAGS = -I$(top_srcdir)/src/lib proxy_LDFLAGS = -ldl proxy_LDADD = ../lib/libproxy.la - diff --git a/src/bindings/python/Makefile.am b/src/bindings/python/Makefile.am index b3e802e..45e5d85 100644 --- a/src/bindings/python/Makefile.am +++ b/src/bindings/python/Makefile.am @@ -1 +1 @@ -python_DATA = libproxy.py +python_DATA = $(top_srcdir)/src/bindings/python/libproxy.py diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am index 04d0c8a..acbcc51 100644 --- a/src/plugins/Makefile.am +++ b/src/plugins/Makefile.am @@ -23,38 +23,38 @@ endif # Environmental Variable Config Plugin envvar_la_SOURCES = envvar.c -envvar_la_CFLAGS = -I../lib +envvar_la_CFLAGS = -I$(top_srcdir)/src/lib envvar_la_LIBADD = ../lib/libproxy.la envvar_la_LDFLAGS = -module -avoid-version # File Config Plugin file_la_SOURCES = file.c -file_la_CFLAGS = -I../lib +file_la_CFLAGS = -I$(top_srcdir)/src/lib file_la_LIBADD = ../lib/libproxy.la file_la_LDFLAGS = -module -avoid-version # GConf/GNOME Config Plugin gnome_la_SOURCES = gnome.c -gnome_la_CFLAGS = -I../lib @GNOME_CFLAGS@ +gnome_la_CFLAGS = -I$(top_srcdir)/src/lib @GNOME_CFLAGS@ gnome_la_LIBADD = ../lib/libproxy.la gnome_la_LDFLAGS = -module -avoid-version @GNOME_LIBS@ # KDE Config Plugin kde_la_SOURCES = kde.c -kde_la_CFLAGS = -I../lib @KDE_CFLAGS@ +kde_la_CFLAGS = -I$(top_srcdir)/src/lib @KDE_CFLAGS@ kde_la_LIBADD = ../lib/libproxy.la kde_la_LDFLAGS = -module -avoid-version @KDE_LIBS@ # Mozilla (Spidermonkey) based PAC runner mozjs_la_SOURCES = mozjs.c -mozjs_la_CFLAGS = -I../lib @MOZJS_CFLAGS@ +mozjs_la_CFLAGS = -I$(top_srcdir)/src/lib @MOZJS_CFLAGS@ mozjs_la_LIBADD = ../lib/libproxy.la mozjs_la_LDFLAGS = -module -avoid-version @MOZJS_LIBS@ nodist_mozjs_la_SOURCES = pacutils.h # NetworkManager Plugin networkmanager_la_SOURCES = networkmanager.c -networkmanager_la_CFLAGS = -I../lib @NETWORKMANAGER_CFLAGS@ +networkmanager_la_CFLAGS = -I$(top_srcdir)/src/lib @NETWORKMANAGER_CFLAGS@ networkmanager_la_LIBADD = ../lib/libproxy.la networkmanager_la_LDFLAGS = -module -avoid-version @NETWORKMANAGER_LIBS@ @@ -69,3 +69,6 @@ pacutils.h: pacutils.js install-data-hook: rm -f $(DESTDIR)$(plugindir)/*.a $(DESTDIR)$(plugindir)/*.la + +uninstall-hook: + rm -f $(DESTDIR)$(plugindir)/*.so |