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

build: Don't run glib-mkenums if there's nothing to do 

This fixes the build without libsoup.

Closes: #296
Approved by: gatispaeglis
This commit is contained in:
Colin Walters 2016-05-12 10:15:24 -04:00 committed by Colin Walters (automation)
parent a5f703799f
commit 817060e772
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile-libostree.am
View File

@ -33,9 +33,11 @@ lib_LTLIBRARIES += libostree-1.la
libostreeincludedir = $(includedir)/ostree-1 libostreeincludedir = $(includedir)/ostree-1
libostreeinclude_HEADERS = $(libostree_public_headers) libostreeinclude_HEADERS = $(libostree_public_headers)
ENUM_TYPES = \ ENUM_TYPES = $(NULL)
$(srcdir)/src/libostree/ostree-fetcher.h \
$(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) src/libostree/ostree-enumtypes.h: src/libostree/ostree-enumtypes.h.template $(ENUM_TYPES)
$(AM_V_GEN) $(GLIB_MKENUMS) \ $(AM_V_GEN) $(GLIB_MKENUMS) \
@ -48,12 +50,14 @@ 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)

3
src/libostree/ostree-dummy-enumtypes.c
View File

@ -1,7 +1,7 @@
/* This file declares a stub function that is only exported /* This file declares a stub function that is only exported
* to pacify ABI checkers - no one could really have used it. * to pacify ABI checkers - no one could really have used it.
* *
* Copyright (C) 2015 Red Hat, Inc. * Copyright (C) 2016 Red Hat, Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
@ -23,7 +23,6 @@
/* Exported for backwards compat - see /* Exported for backwards compat - see
* https://bugzilla.gnome.org/show_bug.cgi?id=764131 * https://bugzilla.gnome.org/show_bug.cgi?id=764131
* https://github.com/ostreedev/ostree/pull/294
*/ */
GType GType
ostree_fetcher_config_flags_get_type (void) ostree_fetcher_config_flags_get_type (void)

2
src/libostree/ostree-dummy-enumtypes.h
View File

@ -1,7 +1,7 @@
/* This file declares a stub function that is only exported /* This file declares a stub function that is only exported
* to pacify ABI checkers - no one could really have used it. * to pacify ABI checkers - no one could really have used it.
* *
* Copyright (C) 2015 Red Hat, Inc. * Copyright (C) 2016 Red Hat, Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public