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

Don't generate st.h in a subdir

Browse Source 
For srcdir != builddir, in the builddir, the st/ subdirectory doesn't
exist, so we can't generate st.h there. Just switch to building st.h
directly in the current directory. (The other option would be to
create a st/ subdirectory in the builddir if necessary; might be a
little cleaner, but this works for now and gets things distchecking.)
This commit is contained in:
Owen W. Taylor 2010-02-22 19:35:03 -05:00
parent e7066d12cf
commit ce6dd21cd3
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -41,7 +41,7 @@ src/gnome-shell
src/test-recorder src/test-recorder
src/test-recorder.ogg src/test-recorder.ogg
src/test-theme src/test-theme
src/st/st.h src/st.h
stamp-h1 stamp-h1
tests/run-test.sh tests/run-test.sh
xmldocs.make xmldocs.make

8
src/Makefile-st.am
View File

@ -98,13 +98,13 @@ st_source_h = \
st/st-widget.h \ st/st-widget.h \
$(NULL) $(NULL)
st/st.h: Makefile st.h: Makefile
$(AM_V_GEN) (echo "#define ST_H_INSIDE 1"; \ $(AM_V_GEN) (echo "#define ST_H_INSIDE 1"; \
for name in $(st_source_h); do \ for name in $(st_source_h); do \
echo "#include <"$$name">"; \ echo "#include <"$$name">"; \
done; echo "#undef ST_H_INSIDE") > st/st.h.tmp && mv st/st.h.tmp st/st.h done; echo "#undef ST_H_INSIDE") > st.h.tmp && mv st.h.tmp st.h
BUILT_SOURCES += st/st.h BUILT_SOURCES += st.h
st_source_private_h = \ st_source_private_h = \
st/st-private.h \ st/st-private.h \
@ -152,7 +152,7 @@ libst_1_0_la_SOURCES = \
$(st_source_private_h) \ $(st_source_private_h) \
$(st_source_private_c) \ $(st_source_private_c) \
$(st_source_h) \ $(st_source_h) \
st/st.h \ st.h \
$(st_built_sources) \ $(st_built_sources) \
$(NULL) $(NULL)
libst_1_0_la_CPPFLAGS = $(st_cflags) libst_1_0_la_CPPFLAGS = $(st_cflags)

2
src/shell-slicer.h
View File

@ -2,7 +2,7 @@
#ifndef __SHELL_SLICER_H__ #ifndef __SHELL_SLICER_H__
#define __SHELL_SLICER_H__ #define __SHELL_SLICER_H__
#include "st/st.h" #include "st.h"
#define SHELL_TYPE_SLICER (shell_slicer_get_type ()) #define SHELL_TYPE_SLICER (shell_slicer_get_type ())
#define SHELL_SLICER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SHELL_TYPE_SLICER, ShellSlicer)) #define SHELL_SLICER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SHELL_TYPE_SLICER, ShellSlicer))