diff options
-rw-r--r-- | Makefile | 35 | ||||
-rw-r--r-- | ipa-client/AUTHORS | 0 | ||||
-rw-r--r-- | ipa-client/NEWS | 0 | ||||
-rw-r--r-- | ipa-client/README | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | ipa-client/autogen.sh | 0 | ||||
-rwxr-xr-x | ipa-client/freeipa-client.spec | 11 | ||||
-rw-r--r-- | ipa-client/freeipa-client.spec.in | 11 | ||||
-rw-r--r-- | ipa-server/AUTHORS | 0 | ||||
-rw-r--r-- | ipa-server/NEWS | 0 | ||||
-rw-r--r-- | ipa-server/README | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | ipa-server/autogen.sh | 0 | ||||
-rwxr-xr-x | ipa-server/freeipa-server.spec | 15 | ||||
-rw-r--r-- | ipa-server/freeipa-server.spec.in | 15 | ||||
-rw-r--r-- | ipa-server/ipa-kpasswd/Makefile.am | 2 | ||||
-rw-r--r-- | ipa-server/ipa-slapi-plugins/dna/Makefile.am | 2 | ||||
-rw-r--r-- | ipa-server/ipa-slapi-plugins/ipa-memberof/Makefile.am | 2 | ||||
-rw-r--r-- | ipa-server/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am | 2 |
17 files changed, 68 insertions, 27 deletions
@@ -40,16 +40,18 @@ all: (cd $$subdir && $(MAKE) $@) || exit 1; \ done -install: all - @for subdir in $(SUBDIRS); do \ - (cd $$subdir && $(MAKE) $@) || exit 1; \ - done +autogen: + cd ipa-server; ./autogen.sh --prefix=/usr --sysconfdir=/etc + cd ipa-client; ./autogen.sh --prefix=/usr --sysconfdir=/etc -clean: +configure: + cd ipa-server; ./configure --prefix=/usr --sysconfdir=/etc + cd ipa-client; ./configure --prefix=/usr --sysconfdir=/etc + +install: all @for subdir in $(SUBDIRS); do \ (cd $$subdir && $(MAKE) $@) || exit 1; \ done - rm -f *~ test: @for subdir in $(SUBDIRS); do \ @@ -87,6 +89,7 @@ tarballs: # ipa-server mv dist/freeipa/ipa-server dist/$(SERV_TARBALL_PREFIX) rm -f dist/$(SERV_TARBALL) + cd dist/$(SERV_TARBALL_PREFIX); ./autogen.sh; make distclean cd dist; tar cfz $(SERV_TARBALL) $(SERV_TARBALL_PREFIX) rm -fr dist/$(SERV_TARBALL_PREFIX) @@ -105,6 +108,7 @@ tarballs: # ipa-client mv dist/freeipa/ipa-client dist/$(CLI_TARBALL_PREFIX) rm -f dist/$(CLI_TARBALL) + cd dist/$(CLI_TARBALL_PREFIX); ./autogen.sh; make distclean cd dist; tar cfz $(CLI_TARBALL) $(CLI_TARBALL_PREFIX) rm -fr dist/$(CLI_TARBALL_PREFIX) @@ -143,7 +147,22 @@ rpms: rpmroot rpm-ipa-server rpm-ipa-admin rpm-ipa-python rpm-ipa-client dist: version-update archive tarballs archive-cleanup rpms -local-dist: clean version-update local-archive tarballs archive-cleanup rpms +local-dist: autogen clean version-update local-archive tarballs archive-cleanup rpms + + +clean: + @for subdir in $(SUBDIRS); do \ + (cd $$subdir && $(MAKE) $@) || exit 1; \ + done + rm -f *~ + +distclean: + @for subdir in $(SUBDIRS); do \ + (cd $$subdir && $(MAKE) $@) || exit 1; \ + done + rm -fr rpmbuild dist -dist-clean: clean +maintainer-clean: clean rm -fr rpmbuild dist + cd ipa-server && $(MAKE) maintainer-clean + cd ipa-client && $(MAKE) maintainer-clean diff --git a/ipa-client/AUTHORS b/ipa-client/AUTHORS new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/ipa-client/AUTHORS diff --git a/ipa-client/NEWS b/ipa-client/NEWS new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/ipa-client/NEWS diff --git a/ipa-client/README b/ipa-client/README new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/ipa-client/README diff --git a/ipa-client/autogen.sh b/ipa-client/autogen.sh index 072bd15a..072bd15a 100644..100755 --- a/ipa-client/autogen.sh +++ b/ipa-client/autogen.sh diff --git a/ipa-client/freeipa-client.spec b/ipa-client/freeipa-client.spec index 67e241d6..7619a014 100755 --- a/ipa-client/freeipa-client.spec +++ b/ipa-client/freeipa-client.spec @@ -1,6 +1,6 @@ Name: freeipa-client Version: 0.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: FreeIPA client Group: System Environment/Base @@ -17,16 +17,16 @@ The client package provide install and configuration scripts for clients. %prep %setup -q +./configure --prefix=%{buildroot}/usr --libdir=%{buildroot}/%{_libdir} --sysconfdir=%{buildroot}/etc %build -make DESTDIR=%{buildroot} +make %install rm -rf %{buildroot} -mkdir -p %{buildroot}%{_sbindir} -make install DESTDIR=%{buildroot} +make install %clean @@ -41,6 +41,9 @@ rm -rf %{buildroot} %{_usr}/share/ipa/* %changelog +* Thu Oct 18 2007 Karl MacMillan <kmacmill@redhat.com> - 0.3.0-2 +- Convert to autotools-based build + * Thu Aug 16 2007 Simo Sorce <ssorce@redhat.com> - 0.1.0-1 - Initial rpm version diff --git a/ipa-client/freeipa-client.spec.in b/ipa-client/freeipa-client.spec.in index 3644e157..fd199f68 100644 --- a/ipa-client/freeipa-client.spec.in +++ b/ipa-client/freeipa-client.spec.in @@ -1,6 +1,6 @@ Name: freeipa-client Version: VERSION -Release: 1%{?dist} +Release: 2%{?dist} Summary: FreeIPA client Group: System Environment/Base @@ -17,16 +17,16 @@ The client package provide install and configuration scripts for clients. %prep %setup -q +./configure --prefix=%{buildroot}/usr --libdir=%{buildroot}/%{_libdir} --sysconfdir=%{buildroot}/etc %build -make DESTDIR=%{buildroot} +make %install rm -rf %{buildroot} -mkdir -p %{buildroot}%{_sbindir} -make install DESTDIR=%{buildroot} +make install %clean @@ -41,6 +41,9 @@ rm -rf %{buildroot} %{_usr}/share/ipa/* %changelog +* Thu Oct 18 2007 Karl MacMillan <kmacmill@redhat.com> - 0.3.0-2 +- Convert to autotools-based build + * Thu Aug 16 2007 Simo Sorce <ssorce@redhat.com> - 0.1.0-1 - Initial rpm version diff --git a/ipa-server/AUTHORS b/ipa-server/AUTHORS new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/ipa-server/AUTHORS diff --git a/ipa-server/NEWS b/ipa-server/NEWS new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/ipa-server/NEWS diff --git a/ipa-server/README b/ipa-server/README new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/ipa-server/README diff --git a/ipa-server/autogen.sh b/ipa-server/autogen.sh index 2e80fc21..2e80fc21 100644..100755 --- a/ipa-server/autogen.sh +++ b/ipa-server/autogen.sh diff --git a/ipa-server/freeipa-server.spec b/ipa-server/freeipa-server.spec index eaca6ac1..a5461cd8 100755 --- a/ipa-server/freeipa-server.spec +++ b/ipa-server/freeipa-server.spec @@ -1,6 +1,6 @@ Name: freeipa-server Version: 0.4.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: FreeIPA authentication server Group: System Environment/Base @@ -21,17 +21,16 @@ FreeIPA is a server for identity, policy, and audit. %prep %setup -q +./configure --prefix=%{buildroot}/usr --libdir=%{buildroot}/%{_libdir} --sysconfdir=%{buildroot}/etc %build -make DESTDIR=%{buildroot} +make %install rm -rf %{buildroot} -mkdir -p %{buildroot}%{_sbindir} -mkdir -p %{buildroot}%{plugin_dir} -make install DESTDIR=%{buildroot} LIBDIR=%{buildroot}%{_libdir} +make install %clean @@ -50,11 +49,17 @@ rm -rf %{buildroot} %{_usr}/share/ipa/* %attr(755,root,root) %{plugin_dir}/libipa_pwd_extop.so +%attr(755,root,root) %{plugin_dir}/libipa_pwd_extop.la %attr(755,root,root) %{plugin_dir}/libipa-memberof-plugin.so +%attr(755,root,root) %{plugin_dir}/libipa-memberof-plugin.la %attr(755,root,root) %{plugin_dir}/libipa-dna-plugin.so +%attr(755,root,root) %{plugin_dir}/libipa-dna-plugin.la %changelog +* Thu Oct 18 2007 Karl MacMillan <kmacmill@redhat.com> - 0.4.0-3 +- Convert to autotools-based build + * Tue Sep 25 2007 Karl MacMillan <kmacmill@redhat.com> - 0.4.0-2 - Package ipa-webgui diff --git a/ipa-server/freeipa-server.spec.in b/ipa-server/freeipa-server.spec.in index 1b7e219f..fc24bb19 100644 --- a/ipa-server/freeipa-server.spec.in +++ b/ipa-server/freeipa-server.spec.in @@ -1,6 +1,6 @@ Name: freeipa-server Version: VERSION -Release: 2%{?dist} +Release: 3%{?dist} Summary: FreeIPA authentication server Group: System Environment/Base @@ -21,17 +21,16 @@ FreeIPA is a server for identity, policy, and audit. %prep %setup -q +./configure --prefix=%{buildroot}/usr --libdir=%{buildroot}/%{_libdir} --sysconfdir=%{buildroot}/etc %build -make DESTDIR=%{buildroot} +make %install rm -rf %{buildroot} -mkdir -p %{buildroot}%{_sbindir} -mkdir -p %{buildroot}%{plugin_dir} -make install DESTDIR=%{buildroot} LIBDIR=%{buildroot}%{_libdir} +make install %clean @@ -50,11 +49,17 @@ rm -rf %{buildroot} %{_usr}/share/ipa/* %attr(755,root,root) %{plugin_dir}/libipa_pwd_extop.so +%attr(755,root,root) %{plugin_dir}/libipa_pwd_extop.la %attr(755,root,root) %{plugin_dir}/libipa-memberof-plugin.so +%attr(755,root,root) %{plugin_dir}/libipa-memberof-plugin.la %attr(755,root,root) %{plugin_dir}/libipa-dna-plugin.so +%attr(755,root,root) %{plugin_dir}/libipa-dna-plugin.la %changelog +* Thu Oct 18 2007 Karl MacMillan <kmacmill@redhat.com> - 0.4.0-3 +- Convert to autotools-based build + * Tue Sep 25 2007 Karl MacMillan <kmacmill@redhat.com> - 0.4.0-2 - Package ipa-webgui diff --git a/ipa-server/ipa-kpasswd/Makefile.am b/ipa-server/ipa-kpasswd/Makefile.am index 4c1cf8c7..02145d25 100644 --- a/ipa-server/ipa-kpasswd/Makefile.am +++ b/ipa-server/ipa-kpasswd/Makefile.am @@ -14,7 +14,7 @@ INCLUDES = \ $(NULL) sbin_PROGRAMS = \ - ipa-kpasswd \ + ipa_kpasswd \ $(NULL) ipa_kpasswd_SOURCES = \ diff --git a/ipa-server/ipa-slapi-plugins/dna/Makefile.am b/ipa-server/ipa-slapi-plugins/dna/Makefile.am index d8d6d1d7..57a99764 100644 --- a/ipa-server/ipa-slapi-plugins/dna/Makefile.am +++ b/ipa-server/ipa-slapi-plugins/dna/Makefile.am @@ -23,6 +23,8 @@ libipa_dna_plugin_la_SOURCES = \ dna.c \ $(NULL) +libipa_dna_plugin_la_LDFLAGS = -avoid-version + libipa_dna_plugin_la_LIBADD = \ $(MOZLDAP_LIBS) \ $(NULL) diff --git a/ipa-server/ipa-slapi-plugins/ipa-memberof/Makefile.am b/ipa-server/ipa-slapi-plugins/ipa-memberof/Makefile.am index bc236c32..54ddd538 100644 --- a/ipa-server/ipa-slapi-plugins/ipa-memberof/Makefile.am +++ b/ipa-server/ipa-slapi-plugins/ipa-memberof/Makefile.am @@ -23,6 +23,8 @@ libipa_memberof_plugin_la_SOURCES = \ ipa-memberof.c \ $(NULL) +libipa_memberof_plugin_la_LDFLAGS = -avoid-version + libipa_memberof_plugin_la_LIBADD = \ $(MOZLDAP_LIBS) \ $(NULL) diff --git a/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am b/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am index 68424383..5c0fb232 100644 --- a/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am +++ b/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am @@ -23,6 +23,8 @@ libipa_pwd_extop_la_SOURCES = \ ipa_pwd_extop.c \ $(NULL) +libipa_pwd_extop_la_LDFLAGS = -avoid-version + libipa_pwd_extop_la_LIBADD = \ $(MOZLDAP_LIBS) \ $(NULL) |