Changeset 4860 for branches/r9


Ignore:
Timestamp:
Dec 12, 2014 8:27:25 AM (8 years ago)
Author:
gah
Message:
 
Location:
branches/r9
Files:
2 deleted
2 edited
2 copied
1 moved

Legend:

Unmodified
Added
Removed
  • branches/r9/configure.in

    r4855 r4860  
    22AC_INIT([Rappture],[1.4],[rappture@nanohub.org])
    33AC_CONFIG_AUX_DIR(cf)
    4 AC_CONFIG_HEADER(src/core/config.h)
     4AC_CONFIG_HEADER(lib/rappture/config.h)
    55
    66#------------------------------------------------------------------------
     
    456456AC_CONFIG_FILES([
    457457    Makefile
    458     src/Makefile
    459     src/core/Makefile
    460     src/core2/Makefile
    461     src/objects/Makefile
    462     src/objects/RpHash.h
     458    lib/Makefile
     459    lib/rappture/Makefile
     460    lib/rappture2/Makefile
     461    lib/objects/Makefile
     462    lib/objects/RpHash.h
    463463    gui/Makefile
    464464    apps/Makefile
  • branches/r9/lib/Makefile.in

    r1944 r4860  
    3232RM              = rm -f
    3333
    34 .PHONY: core core2 objects
     34SUBDIRS         = rappture rappture2 objects
    3535
    36 all:    core core2 objects
     36.PHONY: $(SUBDIRS)
    3737
    38 RAPPTURE_LIB = core/librappture.a
     38all:
     39        for i in $(SUBDIRS) ; do \
     40          $(MAKE) -C $$i all || exit 1 ;\
     41        done
    3942
    40 core:
    41         $(MAKE) -C core all
    42 
    43 core2: core
    44         $(MAKE) -C core2 all
    45 
    46 objects: core
    47         $(MAKE) -C objects all
    48 
    49 install: core
    50         $(MAKE) -C core install
    51         $(MAKE) -C core2 install
    52         $(MAKE) -C objects install
     43install:  all
     44        for i in $(SUBDIRS) ; do \
     45          $(MAKE) -C $$i install || exit 1 ;\
     46        done
    5347
    5448docs:
     
    5751
    5852clean:
    59         $(MAKE) -C core clean
    60         $(MAKE) -C core2 clean
    61         $(MAKE) -C objects clean
     53        for i in $(SUBDIRS) ; do \
     54          $(MAKE) -C $$i clean || exit 1 ;\
     55        done
    6256
    6357distclean: clean
    64         $(MAKE) -C core distclean
    65         $(MAKE) -C core2 distclean
    66         $(MAKE) -C objects distclean
     58        for i in $(SUBDIRS) ; do \
     59          $(MAKE) -C $$i distclean || exit 1 ;\
     60        done
    6761        $(RM) Makefile
Note: See TracChangeset for help on using the changeset viewer.