Changeset 4415

Show
Ignore:
Timestamp:
11/09/06 16:54:55 (2 years ago)
Author:
morris
Message:

Fix build system in same manner as wire

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • wired/trunk/Makefile.in

    r4410 r4415  
    6161        for subdir in $$list; do \ 
    6262                target=`echo $@ | sed s/-recursive//`; \ 
    63                 (cd $$subdir && $(MAKE) $$target) || exit 1; \ 
     63                (cd $$subdir && $(MAKE) -e $$target) || exit 1; \ 
    6464        done 
    6565 
    …… 
    203203        done 
    204204 
    205         $(SHELL) -ec "cd wired-$(WD_VERSION) && WD_MAINTAINER=0 $(MAKE) -e distclean scmclean" 
     205        $(SHELL) -ec "cd wired-$(WD_VERSION) && WD_MAINTAINER=0 WI_MAINTAINER=0 $(MAKE) -e distclean scmclean" 
    206206 
    207207        tar -czf wired-$(WD_VERSION).tar.gz wired-$(WD_VERSION) 
    …… 
    210210clean: clean-recursive 
    211211        rm -f $(objdir)/hl2wired/*.o 
     212        rm -f $(objdir)/hl2wired/*.d 
    212213        rm -f $(objdir)/wired/*.o 
     214        rm -f $(objdir)/wired/*.d 
     215        rm -f $(rundir)/hl2wired 
     216        rm -f $(rundir)/wired 
     217        rm -f $(rundir)/wiredctl 
     218        rm -f $(rundir)/etc/wired.conf 
    213219 
    214220distclean: clean distclean-recursive 

  • wired/trunk/configure

    r4365 r4415  
    30443044        objdir="obj" 
    30453045 
    3046         wd_libwired_objdir="$(pwd)/obj" 
     3046        wd_libwired_objdir="../obj" 
    30473047fi 
    30483048 
    …… 
    30633063        rundir="run" 
    30643064 
    3065         wd_libwired_rundir="$(pwd)/run/libwired" 
     3065        wd_libwired_rundir="../run/libwired" 
    30663066fi 
    30673067 

  • wired/trunk/configure.in

    r4365 r4415  
    159159else 
    160160        AC_SUBST([objdir], ["obj"]) 
    161         wd_libwired_objdir="$(pwd)/obj" 
     161        wd_libwired_objdir="../obj" 
    162162fi 
    163163 
    …… 
    171171else 
    172172        AC_SUBST([rundir], ["run"]) 
    173         wd_libwired_rundir="$(pwd)/run/libwired" 
     173        wd_libwired_rundir="../run/libwired" 
    174174fi 
    175175