packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Colin Walters 2016-12-07 21:00:21 -05:00 committed by Atomic Bot
parent 58e318d678
commit 5155662b57
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile-libostree.am
View File

@ -34,10 +34,7 @@ libostreeincludedir = $(includedir)/ostree-1
libostreeinclude_HEADERS = $(libostree_public_headers) libostreeinclude_HEADERS = $(libostree_public_headers)
ENUM_TYPES = $(NULL) ENUM_TYPES = $(NULL)
if USE_LIBSOUP
ENUM_TYPES += $(srcdir)/src/libostree/ostree-fetcher.h ENUM_TYPES += $(srcdir)/src/libostree/ostree-fetcher.h
endif
src/libostree/ostree-enumtypes.h: src/libostree/ostree-enumtypes.h.template $(ENUM_TYPES) src/libostree/ostree-enumtypes.h: src/libostree/ostree-enumtypes.h.template $(ENUM_TYPES)
$(AM_V_GEN) $(GLIB_MKENUMS) \ $(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\"" \ --fhead "#include \"ostree-enumtypes.h\"" \
$(ENUM_TYPES) > $@.tmp && mv $@.tmp $@ $(ENUM_TYPES) > $@.tmp && mv $@.tmp $@
if USE_LIBSOUP
ENUM_GENERATED = \ ENUM_GENERATED = \
src/libostree/ostree-enumtypes.h \ src/libostree/ostree-enumtypes.h \
src/libostree/ostree-enumtypes.c \ src/libostree/ostree-enumtypes.c \
$(NULL) $(NULL)
BUILT_SOURCES += $(ENUM_GENERATED) BUILT_SOURCES += $(ENUM_GENERATED)
endif
CLEANFILES += $(BUILT_SOURCES) CLEANFILES += $(BUILT_SOURCES)