diff options
| author | Ray Strode <halfline@gmail.com> | 2019-02-26 19:56:11 +0000 |
|---|---|---|
| committer | Ray Strode <halfline@gmail.com> | 2019-02-26 19:56:11 +0000 |
| commit | 1434036bb51ab817906fd668579d97906cfb5c54 (patch) | |
| tree | 649542ee611ea1270fb1b98bcbf8c5c9f215143b | |
| parent | 4d5e8ca9466a3903c4360cabb3c89ed018dd3e35 (diff) | |
| parent | 28262a83d1b2824d51dbeaa2202762bf1b68fd53 (diff) | |
| download | gdm-1434036bb51ab817906fd668579d97906cfb5c54.tar.gz | |
Merge branch 'iainl/dont-dist-generated-files' into 'master'
build: Don't dist generated files
See merge request GNOME/gdm!61
| -rw-r--r-- | data/Makefile.am | 7 | ||||
| -rw-r--r-- | libgdm/Makefile.am | 4 | ||||
| -rw-r--r-- | pam-extensions/Makefile.am | 4 |
3 files changed, 10 insertions, 5 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 162074f1..210bf5d1 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -168,10 +168,8 @@ EXTRA_DIST += \ $(dconf_db_files) \ $(gsettings_SCHEMAS) \ $(schemas_in_files) \ - $(schemas_DATA) \ $(dbusconf_in_files) \ $(localealias_DATA) \ - $(udevrules_DATA) \ gdm.conf-custom.in \ Xsession.in \ Init.in \ @@ -181,8 +179,11 @@ EXTRA_DIST += \ $(NULL) CLEANFILES = \ + 61-gdm.rules \ Xsession \ gdm.conf-custom \ + gdm.schemas \ + gnome-login.session \ Init \ PreSession \ PostSession \ @@ -191,8 +192,6 @@ CLEANFILES = \ DISTCLEANFILES = \ $(dbusconf_DATA) \ - gdm.schemas \ - gnome-login.session \ $(NULL) MAINTAINERCLEANFILES = \ diff --git a/libgdm/Makefile.am b/libgdm/Makefile.am index 2f7d7b61..88534a54 100644 --- a/libgdm/Makefile.am +++ b/libgdm/Makefile.am @@ -85,7 +85,9 @@ nodist_libgdm_la_SOURCES = \ $(END_OF_LIST) pkgconfigdir = $(libdir)/pkgconfig -dist_pkgconfig_DATA = gdm.pc +pkgconfig_DATA = gdm.pc + +CLEANFILES += gdm.pc -include $(INTROSPECTION_MAKEFILE) diff --git a/pam-extensions/Makefile.am b/pam-extensions/Makefile.am index 572494ac..a43c5c88 100644 --- a/pam-extensions/Makefile.am +++ b/pam-extensions/Makefile.am @@ -19,5 +19,9 @@ pam_extensions_include_HEADERS = gdm-pam-extensions.h endif EXTRA_DIST = \ + gdm-pam-extensions.pc.in \ + $(NULL) + +CLEANFILES = \ gdm-pam-extensions.pc \ $(NULL) |