← Back to branch summary

~facundo/ubuntuone-client/aq-slots

« back to all changes in this revision

Viewing changes to Makefile.am

  • Committer: Rodney Dawes
  • Date: 2009-06-26 17:01:42 UTC
  • mto: This revision was merged to the branch mainline in revision 60.
  • Revision ID: rodney.dawes@canonical.com-20090626170142-a738504rgnarizuw
        Remove the canonical namespace, and just use ubuntuone as the toplevel
        Move storage/syncdaemon and storage/u1sync up a level

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile.am
10
10
 
11
11
# Python packages we want to install
12
12
pyshareddir = $(datadir)/pyshared
13
 
pypackages =                                            \
14
 
        canonical/ubuntuone/oauthdesktop                \
15
 
        canonical/ubuntuone/storage/syncdaemon/fsm      \
16
 
        canonical/ubuntuone/storage/syncdaemon          \
17
 
        canonical/ubuntuone/storage/u1sync
 
13
pypackages =                            \
 
14
        ubuntuone/oauthdesktop          \
 
15
        ubuntuone/syncdaemon/fsm        \
 
16
        ubuntuone/syncdaemon            \
 
17
        ubuntuone/u1sync
18
18
 
19
19
# Install our scripts and extra data here
20
20
bin_SCRIPTS =                           \
34
34
apport_DATA = apport/source_ubuntuone-client.py
35
35
 
36
36
# Don't end up pulling in storage-protocol source as well
37
 
pyfiles = $(shell SRCDIR="$(top_srcdir)/canonical"; for i in `find $$SRCDIR -type f`; do printf "$$i "; done)
 
37
pyfiles = $(shell SRCDIR="$(top_srcdir)/ubuntuone"; for i in `find $$SRCDIR -type f`; do printf "$$i "; done)
38
38
 
39
39
check: protocol setup.py Makefile
40
40
        if test "x$(builddir)" == "x$(srcdir)"; then \
45
45
 
46
46
protocol:
47
47
        if test "x$(builddir)" == "x$(srcdir)"; then \
48
 
                if [ ! -e canonical/ubuntuone/storage/protocol ]; then \
49
 
                        $(LN_S) $(USP_PATH) canonical/ubuntuone/storage/protocol; \
 
48
                if [ ! -e ubuntuone/storageprotocol ]; then \
 
49
                        $(LN_S) $(USP_PATH) ubuntuone/storageprotocol; \
50
50
                fi; \
51
51
        fi
52
52
 
79
79
        for i in `find $(builddir) -name "*.pyc"`; do \
80
80
                rm -f $$i; \
81
81
        done
82
 
        rm -f canonical/ubuntuone/storage/protocol
 
82
        rm -f ubuntuone/storageprotocol
83
83
        rm -rf build dist _trial_temp
84
84
 
85
85
EXTRA_DIST =            \