diff options
| author | Trent Lloyd <lathiat@bur.st> | 2005-08-23 13:02:11 +0000 |
|---|---|---|
| committer | Trent Lloyd <lathiat@bur.st> | 2005-08-23 13:02:11 +0000 |
| commit | 5afe2f493d0aca90bb3e05ca7ebd6af50f9daaeb (patch) | |
| tree | 5b1a9bceec6bba8b91579b3936b491d0edb2b221 /avahi-glib | |
| parent | 9d125e3a3ae8a3bc4150756294226b3feb95799e (diff) | |
* Bump version number in configure.ac to 0.2
* Move a few dir definitions in Makefile.am's do that autotools doesn't create empty directories
* Uncomment AM_CONDITIONAL for TARGET_GENTOO which broke the build
* Add missing introspect files to EXTRA_DIST in avahi-daemon/Makefile.am, makes
distcheck pass again.
* Remove the ugly archlinux specific -std=c99 hack
* Replace it with a much more elegant test to see if rtnetlink.h will compile w
ith -std=c99 and disable it if it will not
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@417 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
Diffstat (limited to 'avahi-glib')
| -rw-r--r-- | avahi-glib/Makefile.am | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/avahi-glib/Makefile.am b/avahi-glib/Makefile.am index ce82d68..d4abc81 100644 --- a/avahi-glib/Makefile.am +++ b/avahi-glib/Makefile.am @@ -22,10 +22,10 @@ AM_CFLAGS=-I$(top_srcdir) # This cool debug trap works on i386/gcc only AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")' -avahiincludedir=$(includedir)/avahi-glib - if HAVE_GLIB +avahiincludedir=$(includedir)/avahi-glib + avahiinclude_HEADERS = \ glib-watch.h \ glib-malloc.h @@ -49,4 +49,3 @@ glib_watch_test_CFLAGS = $(AM_CFLAGS) $(GLIB20_CFLAGS) glib_watch_test_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(GLIB20_LIBS) endif - |