From 5155662b57fe5943bba014c3035d87229f55ce54 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 7 Dec 2016 21:00:21 -0500 Subject: [PATCH] build: Always do enum scanning now Since we stopped including the libsoup headers in `ostree-fetcher.h`, we can now unconditionally do enum scanning, and drop a build time conditional. Prep for libcurl porting. Closes: #620 Approved by: jlebon --- Makefile-libostree.am | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Makefile-libostree.am b/Makefile-libostree.am index d6ae6023..a7d7b11b 100644 --- a/Makefile-libostree.am +++ b/Makefile-libostree.am @@ -34,10 +34,7 @@ libostreeincludedir = $(includedir)/ostree-1 libostreeinclude_HEADERS = $(libostree_public_headers) ENUM_TYPES = $(NULL) - -if USE_LIBSOUP ENUM_TYPES += $(srcdir)/src/libostree/ostree-fetcher.h -endif src/libostree/ostree-enumtypes.h: src/libostree/ostree-enumtypes.h.template $(ENUM_TYPES) $(AM_V_GEN) $(GLIB_MKENUMS) \ @@ -50,14 +47,11 @@ src/libostree/ostree-enumtypes.c: src/libostree/ostree-enumtypes.c.template $(EN --fhead "#include \"ostree-enumtypes.h\"" \ $(ENUM_TYPES) > $@.tmp && mv $@.tmp $@ -if USE_LIBSOUP ENUM_GENERATED = \ src/libostree/ostree-enumtypes.h \ src/libostree/ostree-enumtypes.c \ $(NULL) - BUILT_SOURCES += $(ENUM_GENERATED) -endif CLEANFILES += $(BUILT_SOURCES)