IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Jun 12, 2015, 6:18:23 PM (11 years ago)
Author:
eugene
Message:

merge changes from EAM dev branch ohana.20150429

Location:
trunk/Ohana
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Ohana

  • trunk/Ohana/Makefile.Common

    r16093 r38441  
    99BASE_CPPFLAGS = $(CPPFLAGS) -I$(INC) -I$(DESTINC) $(INCDIRS) -D$(ARCH)
    1010BASE_LDFLAGS  = $(LDFLAGS) -L$(LIB) -L$(DESTLIB) $(LIBDIRS) $(LIBFLAGS)
     11
     12FULL_CFLAGS   = $(BASE_CFLAGS)
     13FULL_CPPFLAGS = $(BASE_CPPFLAGS)
     14FULL_LDFLAGS  = $(BASE_LDFLAGS)
     15
     16TEST_CFLAGS   = $(BASE_CFLAGS)
     17TEST_CPPFLAGS = $(BASE_CPPFLAGS)
     18TEST_LDFLAGS  = $(BASE_LDFLAGS)
     19
     20TESTHARNESS   = $(ROOT)/src/libtap/tapcheck.pl
    1121
    1222DVO_LIBS  = $(DESTLIB)/libdvo.a $(DESTLIB)/libFITS.a $(DESTLIB)/libohana.a
     
    3444        $(CC) $(FULL_CFLAGS) -o $@ $^ $(FULL_LDFLAGS)
    3545        @echo "compiled $*"
     46        @echo ""
     47
     48$(TESTDIR)/%.$(ARCH): $(TESTDIR)/%.c
     49        @echo $@
     50        @echo $*
     51        @echo $<
     52        @echo $^
     53        @if [ ! -d $(TESTDIR) ]; then mkdir -p $(TESTDIR); fi
     54        $(CC) $(TEST_CFLAGS) -o $@ $^ $(TEST_LDFLAGS)
     55        @echo "compiled $*"
     56        @echo ""
     57
     58$(TESTBIN)/%: $(TESTDIR)/%.$(ARCH)
     59        @if [ ! -d $(TESTBIN) ]; then mkdir -p $(TESTBIN); fi
     60        rm -f $(TESTBIN)/$*
     61        cp $(TESTDIR)/$*.$(ARCH) $(TESTBIN)/$*
     62        @echo "installed $*"
    3663        @echo ""
    3764
     
    103130        rm -f `find . -name "#*"`
    104131
     132test.clean:
     133        for i in $(TESTPROG); do rm -f $(TESTBIN)/$$i; done
     134        for i in $(TESTPROG); do rm -f $(TESTDIR)/$$i.$(ARCH); done
     135
    105136dist: clean
    106137        rm -rf $(BIN)
Note: See TracChangeset for help on using the changeset viewer.