fixed radclient.c compile error
[freeradius.git] / Makefile
index e0f9d67..7be6a27 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ include Make.inc
 
 .PHONY: all clean install
 
-SUBDIRS                = $(LTDL_SUBDIRS) src raddb scripts doc
+SUBDIRS                = $(LTDL_SUBDIRS) $(wildcard src raddb scripts doc)
 WHAT_TO_MAKE   = all
 
 all:
@@ -21,8 +21,9 @@ clean:
        @$(MAKE) $(MFLAGS) WHAT_TO_MAKE=$@ common
        @rm -f *~
 
-.PHONY: tests
-tests:
+.PHONY: test
+test:
+       @$(MAKE) -C raddb/certs
        @$(MAKE) -C src/tests tests
 
 #
@@ -67,16 +68,40 @@ install:
        done
        $(LIBTOOL) --finish $(R)$(libdir)
 
-common:
-       @for dir in $(SUBDIRS); do \
-               echo "Making $(WHAT_TO_MAKE) in $$dir..."; \
-               $(MAKE) $(MFLAGS) -C $$dir $(WHAT_TO_MAKE) || exit $$?; \
-       done
+ifneq ($(RADMIN),)
+ifneq ($(RGROUP),)
+.PHONY: install-chown
+install-chown:
+       chown -R $(RADMIN)   $(R)$(raddbdir)
+       chgrp -R $(RGROUP)   $(R)$(raddbdir)
+       chmod u=rwx,g=rx,o=  `find $(R)$(raddbdir) -type d -print`
+       chmod u=rw,g=r,o=    `find $(R)$(raddbdir) -type f -print`
+       chown -R $(RADMIN)   $(R)$(logdir)
+       chgrp -R $(RGROUP)   $(R)$(logdir)
+       find $(R)$(logdir) -type d -exec chmod u=rwx,g=rwx,o= {} \;
+       find $(R)$(logdir) -type d -exec chmod g+s {} \;
+       find $(R)$(logdir) -type f -exec chmod u=rw,g=rw,o= {} \;
+       chown -R $(RADMIN)   $(R)$(RUNDIR)
+       chgrp -R $(RGROUP)   $(R)$(RUNDIR)
+       find $(R)$(RUNDIR) -type d -exec chmod u=rwx,g=rwx,o= {} \;
+       find $(R)$(RUNDIR) -type d -exec chmod g+s {} \;
+       find $(R)$(RUNDIR) -type f -exec chmod u=rw,g=rw,o= {} \;
+endif
+endif
+
+.PHONY: common $(SUBDIRS)
+
+common: $(SUBDIRS)
+
+$(SUBDIRS):
+       @echo "Making $(WHAT_TO_MAKE) in $@..."
+       @$(MAKE) $(MFLAGS) -C $@ $(WHAT_TO_MAKE)
 
 distclean: clean
        rm -f config.cache config.log config.status libtool \
                src/include/radpaths.h src/include/stamp-h \
-               libltdl/config.log libltdl/config.status \
+               libltdl/config.cache libltdl/config.log \
+               libltdl/config.status \
                libltdl/libtool
        -find . ! -name configure.in -name \*.in -print | \
                sed 's/\.in$$//' | \
@@ -91,20 +116,18 @@ distclean: clean
 #  Automatic remaking rules suggested by info:autoconf#Automatic_Remaking
 #
 ######################################################################
-reconfig: configure src/include/autoconf.h.in
+.PHONY: reconfig
+reconfig:
+       @$(MAKE) $(MFLAGS) -C src reconfig
+       @$(MAKE) configure
+       @$(MAKE) src/include/autoconf.h.in
 
 configure: configure.in aclocal.m4
        $(AUTOCONF)
 
-# autoheader might not change autoconf.h.in, so touch a stamp file
-src/include/autoconf.h.in: src/include/stamp-h.in
-src/include/stamp-h.in: configure.in
+.PHONY: src/include/autoconf.h.in
+src/include/autoconf.h.in:
        $(AUTOHEADER)
-       echo timestamp > src/include/stamp-h.in
-
-src/include/autoconf.h: src/include/stamp-h
-src/include/stamp-h: src/include/autoconf.h.in config.status
-       ./config.status
 
 config.status: configure
        ./config.status --recheck
@@ -118,6 +141,13 @@ check-includes:
 TAGS:
        etags `find src -type f -name '*.[ch]' -print`
 
+#
+#  Make test certificates.
+#
+.PHONY: certs
+certs:
+       @cd raddb/certs && $(MAKE)
+
 ######################################################################
 #
 #  Make a release.
@@ -126,48 +156,56 @@ TAGS:
 #  BEFORE running this command!
 #
 ######################################################################
-freeradius-server-$(RADIUSD_VERSION): CVS
-       @CVSROOT=`cat CVS/Root`; \
-       cvs -d $$CVSROOT checkout -P -d freeradius-server-$(RADIUSD_VERSION) radiusd
+freeradius-server-$(RADIUSD_VERSION_STRING).tar.gz: .git
+       git archive --format=tar --prefix=freeradius-server-$(RADIUSD_VERSION_STRING)/ v2.x.x | gzip > $@
 
-freeradius-server-$(RADIUSD_VERSION).tar.gz: freeradius-server-$(RADIUSD_VERSION)
-       @tar --exclude=CVS -zcf  $@ $<
-
-freeradius-server-$(RADIUSD_VERSION).tar.gz.sig: freeradius-server-$(RADIUSD_VERSION).tar.gz
+freeradius-server-$(RADIUSD_VERSION_STRING).tar.gz.sig: freeradius-server-$(RADIUSD_VERSION_STRING).tar.gz
        gpg --default-key aland@freeradius.org -b $<
 
-freeradius-server-$(RADIUSD_VERSION).tar.bz2: freeradius-server-$(RADIUSD_VERSION)
-       @tar --exclude=CVS -jcf $@ $<
+freeradius-server-$(RADIUSD_VERSION_STRING).tar.bz2: .git
+       git archive --format=tar --prefix=freeradius-server-$(RADIUSD_VERSION_STRING)/ v2.x.x | bzip2 > $@
 
-freeradius-server-$(RADIUSD_VERSION).tar.bz2.sig: freeradius-server-$(RADIUSD_VERSION).tar.bz2
+freeradius-server-$(RADIUSD_VERSION_STRING).tar.bz2.sig: freeradius-server-$(RADIUSD_VERSION_STRING).tar.bz2
        gpg --default-key aland@freeradius.org -b $<
 
 # high-level targets
 .PHONY: dist-check
 dist-check: redhat/freeradius.spec suse/freeradius.spec debian/changelog
-       @if [ `grep ^Version: redhat/freeradius.spec | sed 's/.*://;s/ //'` != "$(RADIUSD_VERSION)" ]; then \
+       @if [ `grep ^Version: redhat/freeradius.spec | sed 's/.*://;s/ //'` != "$(RADIUSD_VERSION_STRING)" ]; then \
+               cat redhat/freeradius.spec | sed 's/^Version: .*/Version: $(RADIUSD_VERSION_STRING)/' > redhat/.foo; \
+               mv redhat/.foo redhat/freeradius.spec; \
                echo redhat/freeradius.spec 'Version' needs to be updated; \
                exit 1; \
        fi
-       @if [ `grep ^Version: suse/freeradius.spec | sed 's/.*://;s/ //'` != "$(RADIUSD_VERSION)" ]; then \
+       @if [ `grep ^Version: suse/freeradius.spec | sed 's/.*://;s/ //'` != "$(RADIUSD_VERSION_STRING)" ]; then \
+               cat suse/freeradius.spec | sed 's/^Version: .*/Version: $(RADIUSD_VERSION_STRING)/' > suse/.foo; \
+               mv suse/.foo suse/freeradius.spec; \
                echo suse/freeradius.spec 'Version' needs to be updated; \
                exit 1; \
        fi
-       @if [ `head -n 1 debian/changelog | sed 's/.*(//;s/-0).*//;s/-1).*//;'`  != "$(RADIUSD_VERSION)" ]; then \
+       @if [ `head -n 1 debian/changelog | sed 's/.*(//;s/\+.*).*//;s/-1).*//;'`  != "$(RADIUSD_VERSION_STRING)" ]; then \
                echo debian/changelog needs to be updated; \
                exit 1; \
        fi
 
-dist: dist-check freeradius-server-$(RADIUSD_VERSION).tar.gz freeradius-server-$(RADIUSD_VERSION).tar.bz2
+dist: dist-check freeradius-server-$(RADIUSD_VERSION_STRING).tar.gz freeradius-server-$(RADIUSD_VERSION_STRING).tar.bz2
 
-dist-sign: freeradius-server-$(RADIUSD_VERSION).tar.gz.sig freeradius-server-$(RADIUSD_VERSION).tar.bz2.sig
+dist-sign: freeradius-server-$(RADIUSD_VERSION_STRING).tar.gz.sig freeradius-server-$(RADIUSD_VERSION_STRING).tar.bz2.sig
 
-dist-publish: freeradius-server-$(RADIUSD_VERSION).tar.gz.sig freeradius-server-$(RADIUSD_VERSION).tar.gz freeradius-server-$(RADIUSD_VERSION).tar.gz.sig freeradius-server-$(RADIUSD_VERSION).tar.bz2 freeradius-server-$(RADIUSD_VERSION).tar.gz.sig freeradius-server-$(RADIUSD_VERSION).tar.bz2.sig
-       scp $^ freeradius.org@freeradius.org:public_ftp
+dist-publish: freeradius-server-$(RADIUSD_VERSION_STRING).tar.gz.sig freeradius-server-$(RADIUSD_VERSION_STRING).tar.gz freeradius-server-$(RADIUSD_VERSION_STRING).tar.gz.sig freeradius-server-$(RADIUSD_VERSION_STRING).tar.bz2 freeradius-server-$(RADIUSD_VERSION_STRING).tar.gz.sig freeradius-server-$(RADIUSD_VERSION_STRING).tar.bz2.sig
+       scp $^ freeradius.org@ftp.freeradius.org:public_ftp
+#      scp $^ freeradius.org@www.tr.freeradius.org:public_ftp
 
 #
 #  Note that we do NOT do the tagging here!  We just print out what
 #  to do!
 #
-dist-tag: freeradius-server-$(RADIUSD_VERSION).tar.gz freeradius-server-$(RADIUSD_VERSION).tar.bz2
-       @echo "cd freeradius-server-$(RADIUSD_VERSION) && cvs tag release_`echo $(RADIUSD_VERSION) | tr .- __` && cd .."
+dist-tag: freeradius-server-$(RADIUSD_VERSION_STRING).tar.gz freeradius-server-$(RADIUSD_VERSION_STRING).tar.bz2
+       @echo "git tag release_`echo $(RADIUSD_VERSION_STRING) | tr .- __`"
+
+#
+#      Build a debian package
+#
+.PHONY: deb
+deb:
+       fakeroot dpkg-buildpackage -b -uc