brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix srcdir != builddir issues

Browse Source 
* calendar-server subdirectory of build directory needs to
  be created.
* Generate shell-enum-types.c/.h in build directory rather than
  in the possibly-read-only source directory.
This commit is contained in:
Owen W. Taylor 2011-03-08 00:33:52 -05:00
parent 2515d5ad6c
commit 8dcd08f47e
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Makefile-calendar-server.am
View File

@ -4,7 +4,9 @@ service_in_files = calendar-server/org.gnome.Shell.CalendarServer.service.in
service_DATA = $(service_in_files:.service.in=.service) service_DATA = $(service_in_files:.service.in=.service)
$(service_DATA): $(service_in_files) Makefile $(service_DATA): $(service_in_files) Makefile
@sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@.tmp && mv $@.tmp $@ $(AM_V_GEN) \
[ -d $(@D) ] || $(mkdir_p) $(@D) ; \
sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@.tmp && mv $@.tmp $@
libexec_PROGRAMS += gnome-shell-calendar-server libexec_PROGRAMS += gnome-shell-calendar-server

12
src/Makefile.am
View File

@ -225,9 +225,9 @@ stamp-shell-enum-types.h: $(srcdir)/shell-enum-types.h.in $(shell_public_headers
$(AM_V_GEN) ( cd $(srcdir) && \ $(AM_V_GEN) ( cd $(srcdir) && \
$(GLIB_MKENUMS) \ $(GLIB_MKENUMS) \
--template $< \ --template $< \
$(shell_public_headers_h) ) > $@.tmp && \ $(shell_public_headers_h) ) > $(@F).tmp && \
(cmp -s $@.tmp shell-enum-types.h || mv $@.tmp shell-enum-types.h) && \ (cmp -s $(@F).tmp shell-enum-types.h || mv $(@F).tmp shell-enum-types.h) && \
rm -f $@.tmp && \ rm -f $(@F).tmp && \
echo timestamp > $(@F) echo timestamp > $(@F)
EXTRA_DIST += shell-enum-types.h.in EXTRA_DIST += shell-enum-types.h.in
CLEANFILES += stamp-shell-enum-types.h CLEANFILES += stamp-shell-enum-types.h
@ -236,9 +236,9 @@ shell-enum-types.c: shell-enum-types.c.in stamp-shell-enum-types.h
$(AM_V_GEN) ( cd $(srcdir) && \ $(AM_V_GEN) ( cd $(srcdir) && \
$(GLIB_MKENUMS) \ $(GLIB_MKENUMS) \
--template $< \ --template $< \
$(shell_public_headers_h) ) > $@.tmp && \ $(shell_public_headers_h) ) > $(@F).tmp && \
mv $@.tmp $@ && \ mv $(@F).tmp $(@F) && \
rm -f $@.tmp rm -f $(@F).tmp
EXTRA_DIST += shell-enum-types.c.in EXTRA_DIST += shell-enum-types.c.in
libgnome_shell_la_LDFLAGS = -avoid-version libgnome_shell_la_LDFLAGS = -avoid-version