diff options
| author | Bharath Acharya <abharath@novell.com> | 2008-08-12 12:19:31 +0800 |
|---|---|---|
| committer | Bharath Acharya <abharath@src.gnome.org> | 2008-08-12 12:19:31 +0800 |
| commit | e860673f10fd166bb28c78f0535b0eac635f4aa9 (patch) | |
| tree | 5d33e5ac26399305580da76a0824aeb25b55b284 | |
| parent | f5c50178484c5b2fda3170ea66dc50244fcbeb56 (diff) | |
| download | gsoc2013-evolution-e860673f10fd166bb28c78f0535b0eac635f4aa9.tar.gz gsoc2013-evolution-e860673f10fd166bb28c78f0535b0eac635f4aa9.tar.zst gsoc2013-evolution-e860673f10fd166bb28c78f0535b0eac635f4aa9.zip | |
Have a check for OS_WIN32 and handle the schema data differently. make
2008-08-12 Bharath Acharya <abharath@novell.com>
* Makefile.am: Have a check for OS_WIN32 and handle the schema
* data differently. make install error on win32.
svn path=/trunk/; revision=35961
| -rw-r--r-- | plugins/attachment-reminder/ChangeLog | 5 | ||||
| -rw-r--r-- | plugins/attachment-reminder/Makefile.am | 21 | ||||
| -rw-r--r-- | plugins/default-mailer/ChangeLog | 5 | ||||
| -rw-r--r-- | plugins/default-mailer/Makefile.am | 21 | ||||
| -rw-r--r-- | plugins/email-custom-header/ChangeLog | 5 | ||||
| -rw-r--r-- | plugins/email-custom-header/Makefile.am | 21 | ||||
| -rw-r--r-- | plugins/mail-notification/ChangeLog | 5 | ||||
| -rw-r--r-- | plugins/mail-notification/Makefile.am | 21 | ||||
| -rw-r--r-- | plugins/templates/ChangeLog | 5 | ||||
| -rw-r--r-- | plugins/templates/Makefile.am | 21 |
10 files changed, 110 insertions, 20 deletions
diff --git a/plugins/attachment-reminder/ChangeLog b/plugins/attachment-reminder/ChangeLog index afba4a04c5..fb8d1de6c6 100644 --- a/plugins/attachment-reminder/ChangeLog +++ b/plugins/attachment-reminder/ChangeLog @@ -1,5 +1,10 @@ 2008-08-12 Bharath Acharya <abharath@novell.com> + * Makefile.am: Have a check for OS_WIN32 and handle the schema data + differently. make install error on win32. + +2008-08-12 Bharath Acharya <abharath@novell.com> + * Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate dlls on Windows. diff --git a/plugins/attachment-reminder/Makefile.am b/plugins/attachment-reminder/Makefile.am index d1d0ca90ee..d6e9fb8809 100644 --- a/plugins/attachment-reminder/Makefile.am +++ b/plugins/attachment-reminder/Makefile.am @@ -32,12 +32,25 @@ schema_DATA = $(schema_in_files:.schemas.in=.schemas) @INTLTOOL_SCHEMAS_RULE@ +if OS_WIN32 install-data-local: - if test -z "$(DESTDIR)" ; then \ - for p in $(schema_DATA) ; do \ - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p; \ - done \ + if test -z "$(DESTDIR)" ; then \ + for p in $(schema_DATA) ; do \ + (echo set GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE); \ + echo $(GCONFTOOL) --makefile-install-rule $$p) >_temp.bat; \ + cmd /c _temp.bat; \ + rm _temp.bat; \ + done \ fi +else +install-data-local: + if test -z "$(DESTDIR)" ; then \ + for p in $(schema_DATA) ; do \ + GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \ + $(GCONFTOOL) --makefile-install-rule $$p; \ + done \ + fi +endif EXTRA_DIST = org-gnome-evolution-attachment-reminder.eplug.xml \ org-gnome-attachment-reminder.error.xml \ diff --git a/plugins/default-mailer/ChangeLog b/plugins/default-mailer/ChangeLog index 5c52a6f91f..8955f0981d 100644 --- a/plugins/default-mailer/ChangeLog +++ b/plugins/default-mailer/ChangeLog @@ -1,5 +1,10 @@ 2008-08-12 Bharath Acharya <abharath@novell.com> + * Makefile.am: Have a check for OS_WIN32 and handle the schema data + differently. make install error on win32. + +2008-08-12 Bharath Acharya <abharath@novell.com> + * Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate dlls on Windows. diff --git a/plugins/default-mailer/Makefile.am b/plugins/default-mailer/Makefile.am index 123dc3fcac..45f4e29c2b 100644 --- a/plugins/default-mailer/Makefile.am +++ b/plugins/default-mailer/Makefile.am @@ -23,12 +23,25 @@ schema_DATA = $(schema_in_files:.schemas.in=.schemas) @INTLTOOL_SCHEMAS_RULE@ +if OS_WIN32 install-data-local: - if test -z "$(DESTDIR)" ; then \ - for p in $(schema_DATA) ; do \ - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p; \ - done \ + if test -z "$(DESTDIR)" ; then \ + for p in $(schema_DATA) ; do \ + (echo set GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE); \ + echo $(GCONFTOOL) --makefile-install-rule $$p) >_temp.bat; \ + cmd /c _temp.bat; \ + rm _temp.bat; \ + done \ fi +else +install-data-local: + if test -z "$(DESTDIR)" ; then \ + for p in $(schema_DATA) ; do \ + GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \ + $(GCONFTOOL) --makefile-install-rule $$p; \ + done \ + fi +endif EXTRA_DIST = \ org-gnome-default-mailer.eplug.xml \ diff --git a/plugins/email-custom-header/ChangeLog b/plugins/email-custom-header/ChangeLog index 0b916dca61..f3c5c58464 100644 --- a/plugins/email-custom-header/ChangeLog +++ b/plugins/email-custom-header/ChangeLog @@ -1,5 +1,10 @@ 2008-08-12 Bharath Acharya <abharath@novell.com> + * Makefile.am: Have a check for OS_WIN32 and handle the schema data + differently. make install error on win32. + +2008-08-12 Bharath Acharya <abharath@novell.com> + * Makefile.am: Added necessary libraries to link to. Build break while compiling on Windows. diff --git a/plugins/email-custom-header/Makefile.am b/plugins/email-custom-header/Makefile.am index 7b23062c4a..ccc9c787f8 100644 --- a/plugins/email-custom-header/Makefile.am +++ b/plugins/email-custom-header/Makefile.am @@ -35,12 +35,25 @@ schema_DATA = $(schema_in_files:.schemas.in=.schemas) @INTLTOOL_SCHEMAS_RULE@ +if OS_WIN32 install-data-local: - if test -z "$(DESTDIR)" ; then \ - for p in $(schema_DATA) ; do \ - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p; \ - done \ + if test -z "$(DESTDIR)" ; then \ + for p in $(schema_DATA) ; do \ + (echo set GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE); \ + echo $(GCONFTOOL) --makefile-install-rule $$p) >_temp.bat; \ + cmd /c _temp.bat; \ + rm _temp.bat; \ + done \ fi +else +install-data-local: + if test -z "$(DESTDIR)" ; then \ + for p in $(schema_DATA) ; do \ + GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \ + $(GCONFTOOL) --makefile-install-rule $$p; \ + done \ + fi +endif glade_DATA = \ org-gnome-email-custom-header.glade \ diff --git a/plugins/mail-notification/ChangeLog b/plugins/mail-notification/ChangeLog index 7a42367563..81039caa5c 100644 --- a/plugins/mail-notification/ChangeLog +++ b/plugins/mail-notification/ChangeLog @@ -1,3 +1,8 @@ +2008-08-12 Bharath Acharya <abharath@novell.com> + + * Makefile.am: Have a check for OS_WIN32 and handle the schema data + differently. make install error on win32. + 2008-08-11 Matthew Barnes <mbarnes@redhat.com> ** Fixes part of bug #546892 diff --git a/plugins/mail-notification/Makefile.am b/plugins/mail-notification/Makefile.am index 86fc91cc11..80b4fbcc98 100644 --- a/plugins/mail-notification/Makefile.am +++ b/plugins/mail-notification/Makefile.am @@ -29,12 +29,25 @@ schema_DATA = $(schema_in_files:.schemas.in=.schemas) @INTLTOOL_SCHEMAS_RULE@ +if OS_WIN32 install-data-local: - if test -z "$(DESTDIR)" ; then \ - for p in $(schema_DATA) ; do \ - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p; \ - done \ + if test -z "$(DESTDIR)" ; then \ + for p in $(schema_DATA) ; do \ + (echo set GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE); \ + echo $(GCONFTOOL) --makefile-install-rule $$p) >_temp.bat; \ + cmd /c _temp.bat; \ + rm _temp.bat; \ + done \ fi +else +install-data-local: + if test -z "$(DESTDIR)" ; then \ + for p in $(schema_DATA) ; do \ + GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \ + $(GCONFTOOL) --makefile-install-rule $$p; \ + done \ + fi +endif BUILT_SOURCES = $(plugin_DATA) diff --git a/plugins/templates/ChangeLog b/plugins/templates/ChangeLog index a9b5dde1fc..e1157ef1d9 100644 --- a/plugins/templates/ChangeLog +++ b/plugins/templates/ChangeLog @@ -1,5 +1,10 @@ 2008-08-12 Bharath Acharya <abharath@novell.com> + * Makefile.am: Have a check for OS_WIN32 and handle the schema data + differently. make install error on win32. + +2008-08-12 Bharath Acharya <abharath@novell.com> + * Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate dlls on Windows. diff --git a/plugins/templates/Makefile.am b/plugins/templates/Makefile.am index 9369c0293d..5a36917fa2 100644 --- a/plugins/templates/Makefile.am +++ b/plugins/templates/Makefile.am @@ -27,12 +27,25 @@ schema_DATA = $(schema_in_files:.schemas.in=.schemas) @INTLTOOL_SCHEMAS_RULE@ +if OS_WIN32 install-data-local: - if test -z "$(DESTDIR)" ; then \ - for p in $(schema_DATA) ; do \ - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p; \ - done \ + if test -z "$(DESTDIR)" ; then \ + for p in $(schema_DATA) ; do \ + (echo set GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE); \ + echo $(GCONFTOOL) --makefile-install-rule $$p) >_temp.bat; \ + cmd /c _temp.bat; \ + rm _temp.bat; \ + done \ fi +else +install-data-local: + if test -z "$(DESTDIR)" ; then \ + for p in $(schema_DATA) ; do \ + GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \ + $(GCONFTOOL) --makefile-install-rule $$p; \ + done \ + fi +endif EXTRA_DIST = org-gnome-templates.eplug.xml \ $(schema_in_files) \ |