diff options
| author | Eric Wong <normalperson@yhbt.net> | 2008-10-11 23:39:50 -0700 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2008-10-11 23:39:50 -0700 |
| commit | 0df62a2c3cb7af88347d40a17cc336b5d1740f62 (patch) | |
| tree | 25040833144c3e24f6b4702d9b745cd068b5371a /src/Makefile.am | |
| parent | 3456e2de5bf90207d8149a842bb12c3f9bdd218f (diff) | |
| parent | 6e2b0ca9edaed200f250ef487701ad161aa4a168 (diff) | |
| download | mpd-0df62a2c3cb7af88347d40a17cc336b5d1740f62.tar.gz mpd-0df62a2c3cb7af88347d40a17cc336b5d1740f62.tar.xz mpd-0df62a2c3cb7af88347d40a17cc336b5d1740f62.zip | |
Merge branch 'mk/directory'
* mk/directory: (59 commits)
directory: don't use identical struct and variable names
update: replaced update_return with global "modified" flag
update: make the variable "progress" static
update: don't print debug message when song was not modified
update: fix memory leak in directory_update_init()
update: make the job id unsigned
update: job ID must be positive
update: check progress!=IDLE in reap_update_task()
update: fixed stack corruption due to pthread_join() call
updated: always call removeDeletedFromDirectory()
update: eliminated addSubDirectoryToDirectory()
update: make the "song" variable more local
update: do the recursive directory check only once
update: copy stat to new directory
update: avoid duplicate stat() calls
update: rewrote updatePath() using updateInDirectory()
update: don't export updateDirectory()
update: pass const pointer to addSubDirectoryToDirectory()
update: never pass root path to updatePath()
update: merged addDirectoryPathToDB() into addParentPathToDB()
...
Conflicts:
src/song.c
Diffstat (limited to '')
| -rw-r--r-- | src/Makefile.am | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index bfefd5eec..6a7497286 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -39,9 +39,13 @@ mpd_headers = \ command.h \ condition.h \ conf.h \ + database.h \ dbUtils.h \ decode.h \ directory.h \ + directory_print.h \ + directory_save.h \ + update.h \ dirvec.h \ gcc.h \ inputPlugin.h \ @@ -110,9 +114,14 @@ mpd_SOURCES = \ command.c \ condition.c \ conf.c \ + database.c \ dbUtils.c \ decode.c \ directory.c \ + directory_print.c \ + directory_save.c \ + dirvec.c \ + update.c \ inputPlugin.c \ inputStream.c \ inputStream_file.c \ |