[Xenomai-git] Philippe Gerum : copperplate/notifier: merge into threadobj building block
Module: xenomai-forge Branch: master Commit: 03e9b28941d9d6c4d57e0d5e396931539fe01d77 URL: http://git.xenomai.org/?p=xenomai-forge.git;a=commit;h=03e9b28941d9d6c4d57e0d5e396931539fe01d77 Author: Philippe Gerum r...@xenomai.org Date: Thu May 8 17:35:46 2014 +0200 copperplate/notifier: merge into threadobj building block Now that the suspend/resume mechanism for Mercury is trivially simple, just merge it into the threadobj implementation where it belongs to. --- include/copperplate/Makefile.am |1 - include/copperplate/Makefile.in |1 - include/copperplate/notifier.h | 55 - include/copperplate/threadobj.h |2 - lib/copperplate/Makefile.am |1 - lib/copperplate/Makefile.in | 50 --- lib/copperplate/notifier.c | 103 --- lib/copperplate/threadobj.c | 89 + 8 files changed, 90 insertions(+), 212 deletions(-) diff --git a/include/copperplate/Makefile.am b/include/copperplate/Makefile.am index f721ff8..89b92ff 100644 --- a/include/copperplate/Makefile.am +++ b/include/copperplate/Makefile.am @@ -8,7 +8,6 @@ includesub_HEADERS =\ heapobj.h \ init.h \ semobj.h\ - notifier.h \ reference.h \ registry.h \ syncobj.h \ diff --git a/include/copperplate/Makefile.in b/include/copperplate/Makefile.in index cc060cc..1db15f5 100644 --- a/include/copperplate/Makefile.in +++ b/include/copperplate/Makefile.in @@ -345,7 +345,6 @@ includesub_HEADERS = \ heapobj.h \ init.h \ semobj.h\ - notifier.h \ reference.h \ registry.h \ syncobj.h \ diff --git a/include/copperplate/notifier.h b/include/copperplate/notifier.h deleted file mode 100644 index 011accf..000 --- a/include/copperplate/notifier.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (C) 2008 Philippe Gerum r...@xenomai.org. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. - */ - -#ifndef _COPPERPLATE_NOTIFIER_H -#define _COPPERPLATE_NOTIFIER_H - -#include boilerplate/list.h - -struct notifier { - pid_t owner; - struct pvholder link; -}; - -#ifdef __cplusplus -extern C { -#endif - -int notifier_init(struct notifier *nf, pid_t pid); - -static inline void notifier_destroy(struct notifier *nf) -{ -} - -void notifier_destroy(struct notifier *nf); - -void notifier_signal(struct notifier *nf); - -void notifier_wait(void); - -void notifier_disable(struct notifier *nf); - -void notifier_release(struct notifier *nf); - -void notifier_pkg_init(void); - -#ifdef __cplusplus -} -#endif - -#endif /* _COPPERPLATE_NOTIFIER_H */ diff --git a/include/copperplate/threadobj.h b/include/copperplate/threadobj.h index 754de3d..fd87829 100644 --- a/include/copperplate/threadobj.h +++ b/include/copperplate/threadobj.h @@ -77,14 +77,12 @@ void threadobj_save_timeout(struct threadobj_corespec *corespec, #else /* CONFIG_XENO_MERCURY */ #include sys/time.h -#include copperplate/notifier.h struct threadobj_corespec { pthread_cond_t grant_sync; int policy_unlocked; int prio_unlocked; timer_t rr_timer; - struct notifier notifier; struct timespec wakeup; ticks_t period; /** Timeout reported by sysregd. */ diff --git a/lib/copperplate/Makefile.am b/lib/copperplate/Makefile.am index 17ebeb4..2664e53 100644 --- a/lib/copperplate/Makefile.am +++ b/lib/copperplate/Makefile.am @@ -46,7 +46,6 @@ clean-local: libcopperplate_la_LIBADD = libversion.la if XENO_MERCURY -libcopperplate_la_SOURCES += notifier.c libcopperplate_la_LIBADD += ../boilerplate/libboilerplate.la endif diff --git a/lib/copperplate/Makefile.in b/lib/copperplate/Makefile.in index a9b360e..0a948fe 100644 --- a/lib/copperplate/Makefile.in +++ b/lib/copperplate/Makefile.in @@ -79,17 +79,16 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -@XENO_MERCURY_TRUE@am__append_1 = notifier.c -@XENO_MERCURY_TRUE@am__append_2 = ../boilerplate/libboilerplate.la
[Xenomai-git] Philippe Gerum : copperplate/notifier: merge into threadobj building block
Module: xenomai-forge Branch: next Commit: 03e9b28941d9d6c4d57e0d5e396931539fe01d77 URL: http://git.xenomai.org/?p=xenomai-forge.git;a=commit;h=03e9b28941d9d6c4d57e0d5e396931539fe01d77 Author: Philippe Gerum r...@xenomai.org Date: Thu May 8 17:35:46 2014 +0200 copperplate/notifier: merge into threadobj building block Now that the suspend/resume mechanism for Mercury is trivially simple, just merge it into the threadobj implementation where it belongs to. --- include/copperplate/Makefile.am |1 - include/copperplate/Makefile.in |1 - include/copperplate/notifier.h | 55 - include/copperplate/threadobj.h |2 - lib/copperplate/Makefile.am |1 - lib/copperplate/Makefile.in | 50 --- lib/copperplate/notifier.c | 103 --- lib/copperplate/threadobj.c | 89 + 8 files changed, 90 insertions(+), 212 deletions(-) diff --git a/include/copperplate/Makefile.am b/include/copperplate/Makefile.am index f721ff8..89b92ff 100644 --- a/include/copperplate/Makefile.am +++ b/include/copperplate/Makefile.am @@ -8,7 +8,6 @@ includesub_HEADERS =\ heapobj.h \ init.h \ semobj.h\ - notifier.h \ reference.h \ registry.h \ syncobj.h \ diff --git a/include/copperplate/Makefile.in b/include/copperplate/Makefile.in index cc060cc..1db15f5 100644 --- a/include/copperplate/Makefile.in +++ b/include/copperplate/Makefile.in @@ -345,7 +345,6 @@ includesub_HEADERS = \ heapobj.h \ init.h \ semobj.h\ - notifier.h \ reference.h \ registry.h \ syncobj.h \ diff --git a/include/copperplate/notifier.h b/include/copperplate/notifier.h deleted file mode 100644 index 011accf..000 --- a/include/copperplate/notifier.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (C) 2008 Philippe Gerum r...@xenomai.org. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. - */ - -#ifndef _COPPERPLATE_NOTIFIER_H -#define _COPPERPLATE_NOTIFIER_H - -#include boilerplate/list.h - -struct notifier { - pid_t owner; - struct pvholder link; -}; - -#ifdef __cplusplus -extern C { -#endif - -int notifier_init(struct notifier *nf, pid_t pid); - -static inline void notifier_destroy(struct notifier *nf) -{ -} - -void notifier_destroy(struct notifier *nf); - -void notifier_signal(struct notifier *nf); - -void notifier_wait(void); - -void notifier_disable(struct notifier *nf); - -void notifier_release(struct notifier *nf); - -void notifier_pkg_init(void); - -#ifdef __cplusplus -} -#endif - -#endif /* _COPPERPLATE_NOTIFIER_H */ diff --git a/include/copperplate/threadobj.h b/include/copperplate/threadobj.h index 754de3d..fd87829 100644 --- a/include/copperplate/threadobj.h +++ b/include/copperplate/threadobj.h @@ -77,14 +77,12 @@ void threadobj_save_timeout(struct threadobj_corespec *corespec, #else /* CONFIG_XENO_MERCURY */ #include sys/time.h -#include copperplate/notifier.h struct threadobj_corespec { pthread_cond_t grant_sync; int policy_unlocked; int prio_unlocked; timer_t rr_timer; - struct notifier notifier; struct timespec wakeup; ticks_t period; /** Timeout reported by sysregd. */ diff --git a/lib/copperplate/Makefile.am b/lib/copperplate/Makefile.am index 17ebeb4..2664e53 100644 --- a/lib/copperplate/Makefile.am +++ b/lib/copperplate/Makefile.am @@ -46,7 +46,6 @@ clean-local: libcopperplate_la_LIBADD = libversion.la if XENO_MERCURY -libcopperplate_la_SOURCES += notifier.c libcopperplate_la_LIBADD += ../boilerplate/libboilerplate.la endif diff --git a/lib/copperplate/Makefile.in b/lib/copperplate/Makefile.in index a9b360e..0a948fe 100644 --- a/lib/copperplate/Makefile.in +++ b/lib/copperplate/Makefile.in @@ -79,17 +79,16 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -@XENO_MERCURY_TRUE@am__append_1 = notifier.c -@XENO_MERCURY_TRUE@am__append_2 = ../boilerplate/libboilerplate.la
[Xenomai-git] Philippe Gerum : copperplate/notifier: merge to threadobj building block
Module: xenomai-forge Branch: next Commit: 23b57bd8b3a0a9fbc25c8021b36e876d334e8b3e URL: http://git.xenomai.org/?p=xenomai-forge.git;a=commit;h=23b57bd8b3a0a9fbc25c8021b36e876d334e8b3e Author: Philippe Gerum r...@xenomai.org Date: Thu May 8 17:35:46 2014 +0200 copperplate/notifier: merge to threadobj building block Now that the suspend/resume mechanism for Mercury is trivially simple, just merge it where it belongs to, i.e. in the threadobj implementation. --- include/copperplate/Makefile.am |1 - include/copperplate/Makefile.in |1 - include/copperplate/notifier.h | 55 - include/copperplate/threadobj.h |2 - lib/copperplate/Makefile.am |1 - lib/copperplate/Makefile.in | 50 --- lib/copperplate/notifier.c | 103 --- lib/copperplate/threadobj.c | 89 + 8 files changed, 90 insertions(+), 212 deletions(-) diff --git a/include/copperplate/Makefile.am b/include/copperplate/Makefile.am index f721ff8..89b92ff 100644 --- a/include/copperplate/Makefile.am +++ b/include/copperplate/Makefile.am @@ -8,7 +8,6 @@ includesub_HEADERS =\ heapobj.h \ init.h \ semobj.h\ - notifier.h \ reference.h \ registry.h \ syncobj.h \ diff --git a/include/copperplate/Makefile.in b/include/copperplate/Makefile.in index cc060cc..1db15f5 100644 --- a/include/copperplate/Makefile.in +++ b/include/copperplate/Makefile.in @@ -345,7 +345,6 @@ includesub_HEADERS = \ heapobj.h \ init.h \ semobj.h\ - notifier.h \ reference.h \ registry.h \ syncobj.h \ diff --git a/include/copperplate/notifier.h b/include/copperplate/notifier.h deleted file mode 100644 index 011accf..000 --- a/include/copperplate/notifier.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (C) 2008 Philippe Gerum r...@xenomai.org. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. - */ - -#ifndef _COPPERPLATE_NOTIFIER_H -#define _COPPERPLATE_NOTIFIER_H - -#include boilerplate/list.h - -struct notifier { - pid_t owner; - struct pvholder link; -}; - -#ifdef __cplusplus -extern C { -#endif - -int notifier_init(struct notifier *nf, pid_t pid); - -static inline void notifier_destroy(struct notifier *nf) -{ -} - -void notifier_destroy(struct notifier *nf); - -void notifier_signal(struct notifier *nf); - -void notifier_wait(void); - -void notifier_disable(struct notifier *nf); - -void notifier_release(struct notifier *nf); - -void notifier_pkg_init(void); - -#ifdef __cplusplus -} -#endif - -#endif /* _COPPERPLATE_NOTIFIER_H */ diff --git a/include/copperplate/threadobj.h b/include/copperplate/threadobj.h index 754de3d..fd87829 100644 --- a/include/copperplate/threadobj.h +++ b/include/copperplate/threadobj.h @@ -77,14 +77,12 @@ void threadobj_save_timeout(struct threadobj_corespec *corespec, #else /* CONFIG_XENO_MERCURY */ #include sys/time.h -#include copperplate/notifier.h struct threadobj_corespec { pthread_cond_t grant_sync; int policy_unlocked; int prio_unlocked; timer_t rr_timer; - struct notifier notifier; struct timespec wakeup; ticks_t period; /** Timeout reported by sysregd. */ diff --git a/lib/copperplate/Makefile.am b/lib/copperplate/Makefile.am index 17ebeb4..2664e53 100644 --- a/lib/copperplate/Makefile.am +++ b/lib/copperplate/Makefile.am @@ -46,7 +46,6 @@ clean-local: libcopperplate_la_LIBADD = libversion.la if XENO_MERCURY -libcopperplate_la_SOURCES += notifier.c libcopperplate_la_LIBADD += ../boilerplate/libboilerplate.la endif diff --git a/lib/copperplate/Makefile.in b/lib/copperplate/Makefile.in index a9b360e..0a948fe 100644 --- a/lib/copperplate/Makefile.in +++ b/lib/copperplate/Makefile.in @@ -79,17 +79,16 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -@XENO_MERCURY_TRUE@am__append_1 = notifier.c -@XENO_MERCURY_TRUE@am__append_2 = ../boilerplate/libboilerplate.la
[Xenomai-git] Philippe Gerum : copperplate/notifier: merge to threadobj building block
Module: xenomai-forge Branch: next Commit: a36021cdf17298ef27830af5de651b0f92c6c663 URL: http://git.xenomai.org/?p=xenomai-forge.git;a=commit;h=a36021cdf17298ef27830af5de651b0f92c6c663 Author: Philippe Gerum r...@xenomai.org Date: Thu May 8 17:35:46 2014 +0200 copperplate/notifier: merge to threadobj building block Now that the suspend/resume mechanism for Mercury is trivially simple, just merge it into where it belongs to, i.e. in the threadobj implementation. --- include/copperplate/Makefile.am |1 - include/copperplate/Makefile.in |1 - include/copperplate/notifier.h | 55 - include/copperplate/threadobj.h |2 - lib/copperplate/Makefile.am |1 - lib/copperplate/Makefile.in | 50 --- lib/copperplate/notifier.c | 103 --- lib/copperplate/threadobj.c | 89 + 8 files changed, 90 insertions(+), 212 deletions(-) diff --git a/include/copperplate/Makefile.am b/include/copperplate/Makefile.am index f721ff8..89b92ff 100644 --- a/include/copperplate/Makefile.am +++ b/include/copperplate/Makefile.am @@ -8,7 +8,6 @@ includesub_HEADERS =\ heapobj.h \ init.h \ semobj.h\ - notifier.h \ reference.h \ registry.h \ syncobj.h \ diff --git a/include/copperplate/Makefile.in b/include/copperplate/Makefile.in index cc060cc..1db15f5 100644 --- a/include/copperplate/Makefile.in +++ b/include/copperplate/Makefile.in @@ -345,7 +345,6 @@ includesub_HEADERS = \ heapobj.h \ init.h \ semobj.h\ - notifier.h \ reference.h \ registry.h \ syncobj.h \ diff --git a/include/copperplate/notifier.h b/include/copperplate/notifier.h deleted file mode 100644 index 011accf..000 --- a/include/copperplate/notifier.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (C) 2008 Philippe Gerum r...@xenomai.org. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. - */ - -#ifndef _COPPERPLATE_NOTIFIER_H -#define _COPPERPLATE_NOTIFIER_H - -#include boilerplate/list.h - -struct notifier { - pid_t owner; - struct pvholder link; -}; - -#ifdef __cplusplus -extern C { -#endif - -int notifier_init(struct notifier *nf, pid_t pid); - -static inline void notifier_destroy(struct notifier *nf) -{ -} - -void notifier_destroy(struct notifier *nf); - -void notifier_signal(struct notifier *nf); - -void notifier_wait(void); - -void notifier_disable(struct notifier *nf); - -void notifier_release(struct notifier *nf); - -void notifier_pkg_init(void); - -#ifdef __cplusplus -} -#endif - -#endif /* _COPPERPLATE_NOTIFIER_H */ diff --git a/include/copperplate/threadobj.h b/include/copperplate/threadobj.h index 754de3d..fd87829 100644 --- a/include/copperplate/threadobj.h +++ b/include/copperplate/threadobj.h @@ -77,14 +77,12 @@ void threadobj_save_timeout(struct threadobj_corespec *corespec, #else /* CONFIG_XENO_MERCURY */ #include sys/time.h -#include copperplate/notifier.h struct threadobj_corespec { pthread_cond_t grant_sync; int policy_unlocked; int prio_unlocked; timer_t rr_timer; - struct notifier notifier; struct timespec wakeup; ticks_t period; /** Timeout reported by sysregd. */ diff --git a/lib/copperplate/Makefile.am b/lib/copperplate/Makefile.am index 17ebeb4..2664e53 100644 --- a/lib/copperplate/Makefile.am +++ b/lib/copperplate/Makefile.am @@ -46,7 +46,6 @@ clean-local: libcopperplate_la_LIBADD = libversion.la if XENO_MERCURY -libcopperplate_la_SOURCES += notifier.c libcopperplate_la_LIBADD += ../boilerplate/libboilerplate.la endif diff --git a/lib/copperplate/Makefile.in b/lib/copperplate/Makefile.in index a9b360e..0a948fe 100644 --- a/lib/copperplate/Makefile.in +++ b/lib/copperplate/Makefile.in @@ -79,17 +79,16 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -@XENO_MERCURY_TRUE@am__append_1 = notifier.c -@XENO_MERCURY_TRUE@am__append_2 = ../boilerplate/libboilerplate.la
[Xenomai-git] Philippe Gerum : copperplate/notifier: merge into threadobj building block
Module: xenomai-forge Branch: next Commit: f88858da3758d4684ece1b267f8c1e9a16d8cc2e URL: http://git.xenomai.org/?p=xenomai-forge.git;a=commit;h=f88858da3758d4684ece1b267f8c1e9a16d8cc2e Author: Philippe Gerum r...@xenomai.org Date: Thu May 8 17:35:46 2014 +0200 copperplate/notifier: merge into threadobj building block Now that the suspend/resume mechanism for Mercury is trivially simple, just merge it into the threadobj implementation where it belongs to. --- include/copperplate/Makefile.am |1 - include/copperplate/Makefile.in |1 - include/copperplate/notifier.h | 55 - include/copperplate/threadobj.h |2 - lib/copperplate/Makefile.am |1 - lib/copperplate/Makefile.in | 50 --- lib/copperplate/notifier.c | 103 --- lib/copperplate/threadobj.c | 89 + 8 files changed, 90 insertions(+), 212 deletions(-) diff --git a/include/copperplate/Makefile.am b/include/copperplate/Makefile.am index f721ff8..89b92ff 100644 --- a/include/copperplate/Makefile.am +++ b/include/copperplate/Makefile.am @@ -8,7 +8,6 @@ includesub_HEADERS =\ heapobj.h \ init.h \ semobj.h\ - notifier.h \ reference.h \ registry.h \ syncobj.h \ diff --git a/include/copperplate/Makefile.in b/include/copperplate/Makefile.in index cc060cc..1db15f5 100644 --- a/include/copperplate/Makefile.in +++ b/include/copperplate/Makefile.in @@ -345,7 +345,6 @@ includesub_HEADERS = \ heapobj.h \ init.h \ semobj.h\ - notifier.h \ reference.h \ registry.h \ syncobj.h \ diff --git a/include/copperplate/notifier.h b/include/copperplate/notifier.h deleted file mode 100644 index 011accf..000 --- a/include/copperplate/notifier.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (C) 2008 Philippe Gerum r...@xenomai.org. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. - */ - -#ifndef _COPPERPLATE_NOTIFIER_H -#define _COPPERPLATE_NOTIFIER_H - -#include boilerplate/list.h - -struct notifier { - pid_t owner; - struct pvholder link; -}; - -#ifdef __cplusplus -extern C { -#endif - -int notifier_init(struct notifier *nf, pid_t pid); - -static inline void notifier_destroy(struct notifier *nf) -{ -} - -void notifier_destroy(struct notifier *nf); - -void notifier_signal(struct notifier *nf); - -void notifier_wait(void); - -void notifier_disable(struct notifier *nf); - -void notifier_release(struct notifier *nf); - -void notifier_pkg_init(void); - -#ifdef __cplusplus -} -#endif - -#endif /* _COPPERPLATE_NOTIFIER_H */ diff --git a/include/copperplate/threadobj.h b/include/copperplate/threadobj.h index 754de3d..fd87829 100644 --- a/include/copperplate/threadobj.h +++ b/include/copperplate/threadobj.h @@ -77,14 +77,12 @@ void threadobj_save_timeout(struct threadobj_corespec *corespec, #else /* CONFIG_XENO_MERCURY */ #include sys/time.h -#include copperplate/notifier.h struct threadobj_corespec { pthread_cond_t grant_sync; int policy_unlocked; int prio_unlocked; timer_t rr_timer; - struct notifier notifier; struct timespec wakeup; ticks_t period; /** Timeout reported by sysregd. */ diff --git a/lib/copperplate/Makefile.am b/lib/copperplate/Makefile.am index 17ebeb4..2664e53 100644 --- a/lib/copperplate/Makefile.am +++ b/lib/copperplate/Makefile.am @@ -46,7 +46,6 @@ clean-local: libcopperplate_la_LIBADD = libversion.la if XENO_MERCURY -libcopperplate_la_SOURCES += notifier.c libcopperplate_la_LIBADD += ../boilerplate/libboilerplate.la endif diff --git a/lib/copperplate/Makefile.in b/lib/copperplate/Makefile.in index a9b360e..0a948fe 100644 --- a/lib/copperplate/Makefile.in +++ b/lib/copperplate/Makefile.in @@ -79,17 +79,16 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -@XENO_MERCURY_TRUE@am__append_1 = notifier.c -@XENO_MERCURY_TRUE@am__append_2 = ../boilerplate/libboilerplate.la