diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2012-01-26 19:18:45 +0100 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@redhat.com> | 2012-01-26 19:33:05 +0100 |
| commit | 8d91018450eb01fcce0155be72815b80b9dbd5ae (patch) | |
| tree | aa6db4390cd0e78d47542e4b0b50f500f32c51f4 | |
| parent | 56975c0f4d51b7130ae46f933d3f7e9f45805b11 (diff) | |
build: fix out-of-tree build
Fix out of tree build, and some minor clean-up.
| -rw-r--r-- | SpiceXPI/Makefile.am | 13 | ||||
| -rw-r--r-- | SpiceXPI/src/plugin/Makefile.am | 2 |
2 files changed, 6 insertions, 9 deletions
diff --git a/SpiceXPI/Makefile.am b/SpiceXPI/Makefile.am index 9f0ad0b..5cef195 100644 --- a/SpiceXPI/Makefile.am +++ b/SpiceXPI/Makefile.am @@ -3,13 +3,8 @@ SUBDIRS=src XPI=SpiceXPI.xpi EXTRA_DIST = logger.ini -sharedir=/usr/share/spice -share_DATA = \ - logger.ini \ - $(NULL) - -logger.ini : - echo do nothing +spicedatadir = $(datadir)/spice +spicedata_DATA = logger.ini DISTDIR=dist ZIP=zip @@ -19,10 +14,10 @@ all-local: SpiceXPI.xpi CLEANFILES = SpiceXPI.xpi SpiceXPI.xpi: $(top_builddir)/SpiceXPI/src/install.rdf $(top_builddir)/SpiceXPI/src/plugin/nsISpicec.xpt $(top_builddir)/SpiceXPI/src/plugin/.libs/libnsISpicec.so - rm -rf dist + rm -rf $(DISTDIR) @[ -d $(DISTDIR)/plugins ] || mkdir -p $(DISTDIR)/plugins cp $(top_srcdir)/SpiceXPI/src/install.rdf $(DISTDIR) - cp $(top_srcdir)/SpiceXPI/src/plugin/*.xpt $(DISTDIR)/plugins + cp $(top_builddir)/SpiceXPI/src/plugin/*.xpt $(DISTDIR)/plugins cp $(top_builddir)/SpiceXPI/src/plugin/.libs/libnsISpicec.so* $(DISTDIR)/plugins/nsISpicec.so cp $(top_srcdir)/SpiceXPI/logger.ini $(DISTDIR)/plugins/logger.ini (cd $(DISTDIR); $(ZIP) -r ../$(XPI) .) diff --git a/SpiceXPI/src/plugin/Makefile.am b/SpiceXPI/src/plugin/Makefile.am index c6ba8f0..b2c83ab 100644 --- a/SpiceXPI/src/plugin/Makefile.am +++ b/SpiceXPI/src/plugin/Makefile.am @@ -81,3 +81,5 @@ BUILT_SOURCES = \ nsISpicec.xpt \ $(NULL) +distclean-local: + rm -f $(BUILT_SOURCES) |