Skip to content

Commit

Permalink
Use git.mk
Browse files Browse the repository at this point in the history
It's a lot nicer than manually maintaining .gitignore in general.

Closes: ostreedev#235
Approved by: giuseppe
  • Loading branch information
cgwalters authored and cgwalters-bot committed Apr 7, 2016
1 parent e81aabb commit 984bf91
Show file tree
Hide file tree
Showing 7 changed files with 406 additions and 103 deletions.
99 changes: 0 additions & 99 deletions .gitignore

This file was deleted.

2 changes: 0 additions & 2 deletions Makefile-decls.am
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@ gir_DATA =
typelibdir = $(libdir)/girepository-1.0
typelib_DATA =
gsettings_SCHEMAS =
# git.mk
GITIGNOREFILES =

# This is a special facility to chain together hooks easily
INSTALL_DATA_HOOKS =
Expand Down
1 change: 1 addition & 0 deletions Makefile-tests.am
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,7 @@ EXTRA_DIST += \
tests/libreaddir-rand.so: Makefile
$(AM_V_GEN) ln -fns ../.libs/libreaddir-rand.so tests
ALL_LOCAL_RULES += tests/libreaddir-rand.so
CLEANFILES += tests/libreaddir-rand.so

# Unfortunately the glib test data APIs don't actually handle
# non-recursive Automake, so we change our code to canonically look
Expand Down
4 changes: 4 additions & 0 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ AM_CPPFLAGS += -DDATADIR='"$(datadir)"' -DLIBEXECDIR='"$(libexecdir)"' \
AM_CFLAGS += $(WARN_CFLAGS)
DISTCHECK_CONFIGURE_FLAGS += --enable-gtk-doc --disable-maintainer-mode

GITIGNOREFILES = aclocal.m4 build-aux/ buildutil/*.m4 config.h.in gtk-doc.make

SUBDIRS += .

if ENABLE_GTK_DOC
Expand Down Expand Up @@ -101,3 +103,5 @@ release-tarball-embedded:
$(embed_dependency) embedded-dependencies/libsoup; \
mv ostree-embeddeps-$${GITVERSION}.tar{.tmp,}; \
gzip -f ostree-embeddeps-$${GITVERSION}.tar

-include $(top_srcdir)/git.mk
53 changes: 51 additions & 2 deletions apidoc/.gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,51 @@
ostree*.1
ostree*.5
*.lo
*.o
.deps
.libs
/*.bak
/*.gcda
/*.gcno
/*.orig
/*.rej
/*.tab.c
/*~
/.*.sw[nop]
/.dirstamp
/.gitignore
/GPATH
/GRTAGS
/GSYMS
/GTAGS
/ID
/Makefile
/Makefile.in
/TAGS
/gtkdoc-check.test
/html
/html-build.stamp
/html.stamp
/ostree-decl-list.txt
/ostree-decl.txt
/ostree-undeclared.txt
/ostree-undocumented.txt
/ostree-unused.txt
/ostree.args
/ostree.hierarchy
/ostree.interfaces
/ostree.pdf
/ostree.prerequisites
/ostree.signals
/ostree.types
/pdf-build.stamp
/pdf.stamp
/scan-build.stamp
/setup-build.stamp
/sgml-build.stamp
/sgml.stamp
/so_locations
/tags
/tmpl
/tmpl/*.bak
/tmpl/ostree-unused.sgml
/xml
_libs
2 changes: 2 additions & 0 deletions apidoc/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -121,3 +121,5 @@ EXTRA_DIST += \
version.xml \
ostree-sections.txt \
$(NULL)

-include $(top_srcdir)/git.mk
Loading

0 comments on commit 984bf91

Please sign in to comment.