X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=08ff1578f877510073b9bce7fc4eac5a8d9cfdd9;hb=d93fb59c50a720e2a1ace2177cc824c00ff8eed6;hp=84f165476d33aa55dc10c159d05b64d51f44a7f2;hpb=82c6558e0109f66091e3a8e2c4ceef0372b0b331;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 84f165476..08ff1578f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,8 +21,7 @@ AM_LDFLAGS = \
 	-Wl,--as-needed
 
 DISTCHECK_CONFIGURE_FLAGS = \
-	--enable-gtk-doc \
-	--enable-extras
+	--enable-gtk-doc
 
 CLEANFILES =
 
@@ -30,7 +29,7 @@ CLEANFILES =
 # libudev
 # ------------------------------------------------------------------------------
 LIBUDEV_CURRENT=5
-LIBUDEV_REVISION=0
+LIBUDEV_REVISION=1
 LIBUDEV_AGE=5
 
 SUBDIRS += libudev/docs
@@ -364,6 +363,7 @@ extras/gudev/gudevenumtypes.c: extras/gudev/gudevenumtypes.c.template extras/gud
 	$(AM_V_GEN)glib-mkenums --template $^ > \
 	    $@.tmp && mv $@.tmp $@
 
+if ENABLE_INTROSPECTION
 extras/gudev/GUdev-1.0.gir: extras/gudev/libgudev-1.0.la $(G_IR_SCANNER) Makefile.am
 	$(AM_V_GEN)PKG_CONFIG_PATH=$(top_builddir)/data:$$PKG_CONFIG_PATH \
 	LD_LIBRARY_PATH=$(top_builddir)/extras/gudev \
@@ -378,7 +378,7 @@ extras/gudev/GUdev-1.0.gir: extras/gudev/libgudev-1.0.la $(G_IR_SCANNER) Makefil
 		--pkg=gobject-2.0 \
 		-I$(top_srcdir)/extras \
 		-D_GUDEV_COMPILATION \
-		-DG_UDEV_API_IS_SUBJECT_TO_CHANGE \
+		-D_GUDEV_WORK_AROUND_DEV_T_BUG \
 		$(top_srcdir)/extras/gudev/gudev.h \
 		$(top_srcdir)/extras/gudev/gudevtypes.h \
 		$(top_srcdir)/extras/gudev/gudevenums.h \
@@ -391,14 +391,12 @@ extras/gudev/GUdev-1.0.gir: extras/gudev/libgudev-1.0.la $(G_IR_SCANNER) Makefil
 extras/gudev/GUdev-1.0.typelib: extras/gudev/GUdev-1.0.gir $(G_IR_COMPILER)
 	$(AM_V_GEN)g-ir-compiler $< -o $@
 
-if ENABLE_INTROSPECTION
 girdir = $(GIRDIR)
 gir_DATA = extras/gudev/GUdev-1.0.gir
 
 typelibsdir = $(GIRTYPELIBDIR)
 typelibs_DATA = extras/gudev/GUdev-1.0.typelib
 
-EXTRA_DIST += GUdev-1.0.gir
 CLEANFILES += $(gir_DATA) $(typelibs_DATA)
 endif # ENABLE_INTROSPECTION