diff options
| -rw-r--r-- | sync/ChangeLog | 5 | ||||
| -rw-r--r-- | sync/src/Makefile.am | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/sync/ChangeLog b/sync/ChangeLog index 5d1863f..21b2c5a 100644 --- a/sync/ChangeLog +++ b/sync/ChangeLog @@ -1,3 +1,8 @@ +2006-12-23 Chris Lord <chris@openedhand.com> + + * src/Makefile.am: + Rename 'sync'->'synctool' so as not to conflict with /bin/sync + 2006-12-22 Chris Lord <chris@openedhand.com> * configure.ac: diff --git a/sync/src/Makefile.am b/sync/src/Makefile.am index cad3d61..b82c896 100644 --- a/sync/src/Makefile.am +++ b/sync/src/Makefile.am @@ -3,9 +3,9 @@ AM_CFLAGS = -Wall -export-dynamic $(SYNC_CFLAGS) lib_LTLIBRARIES = libsync.la -bin_PROGRAMS = sync +bin_PROGRAMS = synctool -sync_SOURCES = sync_main.c sync_main.h +synctool_SOURCES = sync_main.c sync_main.h libsync_la_SOURCES = \ sync_group.c sync_group.h sync_item.c \ @@ -15,14 +15,14 @@ libsync_la_SOURCES = \ sync_gcal_item.c sync_gcal_item.h \ sync_collection.c sync_collection.h -libsync_la_LIBADD = $(DATES_LIBS) +libsync_la_LIBADD = $(SYNC_LIBS) libsyncincludedir = $(includedir)/sync/ libsyncinclude_HEADERS = \ sync_item.h sync_file_item.h sync_evo2_item.h sync_gcal_item.h \ sync_syncml_item.h sync_syncml_server_item.h sync_group.h \ sync_collection.h -sync_LDADD = $(SYNC_LIBS) libsync.la +synctool_LDADD = $(SYNC_LIBS) libsync.la pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libsync.pc |