Changeset 10509

Timestamp:

Dec 6, 2006, 12:45:31 PM (19 years ago)

Author:

eugene

Message:

some makefile cleanups

Location:

trunk/Ohana

Files:

• Makefile (modified) (2 diffs)
• Makefile.Common (modified) (1 diff)
• src/imregister/Makefile (modified) (4 diffs)
• src/misc/Makefile (modified) (4 diffs)
• src/opihi/dvo/Makefile (modified) (1 diff)
• src/opihi/mana/Makefile (modified) (1 diff)

trunk/Ohana/Makefile

@@ -36 +36 @@
 gcompare    \
 imclean     \
+imregister  \
 kapa        \
 kii         \
+misc        \
 mosastro    \
 nightd      \
@@ -46 +48 @@
 tcl         \
 uniphot
-
-# XXXX these need to be updated after the makefile system re-org
-FIXME = \
-imregister  \
-misc        
-
 
 # any of these programs can be built with 'make (name)' 

trunk/Ohana/Makefile.Common

@@ -21 +21 @@
 
 $(BIN)/%.$(ARCH):
+        @echo "trying $*"
         @if [ ! -d $(BIN) ]; then mkdir -p $(BIN); fi
         $(CC) -o $@ $^ $(LDFLAGS)

trunk/Ohana/src/imregister/Makefile

@@ +1 @@
+default: all
+help:
+        @echo "make options: all imregister etc (default)"
+
 include ../../Configure
 HOME    =       $(ROOT)/src/imregister
-
-default: all
-
 BIN     =       $(HOME)/bin
 LIB     =       $(HOME)/lib
-INC     =       $(HOME)/include
 SRC     =       $(HOME)/src
 MAN     =       $(HOME)/doc
-DESTBIN =       $(BINDIR)
-DESTLIB =       $(LIBDIR)
-DESTINC =       $(INCDIR)
-DESTMAN =       $(MANDIR)
+INC     =       $(HOME)/include
+include ../../Makefile.Common
 
 BASEDIR =       $(HOME)/base
@@ -21 +19 @@
 SPREG   =       $(HOME)/spreg
 
-CFLAGS  =       -I$(INC) -I$(INCDIR) $(INCDIRS)
-LFLAGS  =       -L$(LIB) -L$(LIBDIR) $(LIBDIRS) -ldvo -lFITS -lohana $(LIBFLAGS) 
+LDFLAGS :=      -ldvo -lFITS -lohana $(LDFLAGS)
 
 # programs which should be installed
@@ -115 +112 @@
 all: $(INSTALL) $(DEVEL)
 
-IR = $(IMREG)/args.imregister.$(ARCH).o    $(IMOBJ)   $(BASEOBJ)
-IS = $(IMREG)/args.imsearch.$(ARCH).o      $(IMOBJ)   $(BASEOBJ)
-DR = $(DETREND)/args.detregister.$(ARCH).o $(DETOBJ)  $(BASEOBJ)
-DS = $(DETREND)/args.detsearch.$(ARCH).o   $(DETOBJ)  $(BASEOBJ)
-PS = $(PHOTREG)/args.photsearch.$(ARCH).o  $(PHOTOBJ) $(BASEOBJ)
-PR = $(PHOTREG)/args.photreg.$(ARCH).o     $(PHOTOBJ) $(BASEOBJ)
-SR = $(SPREG)/args.spregister.$(ARCH).o    $(SPOBJ)   $(BASEOBJ)
-SS = $(SPREG)/args.spsearch.$(ARCH).o      $(SPOBJ)   $(BASEOBJ)
-IP = $(IMPHOTOBJ) $(BASEOBJ)
+$(INSTALL) $(DEVEL) : % : $(BIN)/%.$(ARCH)
 
-$(SR) : $(INC)/spreg.h $(INC)/imregister.h
-$(SS) : $(INC)/spreg.h $(INC)/imregister.h
+IR1 = $(SRC)/imsearch.$(ARCH).o     $(IMREG)/args.imsearch.$(ARCH).o      $(IMOBJ)   $(BASEOBJ)
+IR2 = $(SRC)/imregister.$(ARCH).o   $(IMREG)/args.imregister.$(ARCH).o    $(IMOBJ)   $(BASEOBJ)
+IR3 = $(SRC)/imregister.$(ARCH).o   $(IMREG)/args.imregister.$(ARCH).o    $(IMOBJ)   $(BASEOBJ)
+IR4 = $(SRC)/imregister.$(ARCH).o   $(IMREG)/args.imregister.$(ARCH).o    $(IMOBJ)   $(BASEOBJ)
+IR5 = $(SRC)/imregister.$(ARCH).o   $(IMREG)/args.imregister.$(ARCH).o    $(IMOBJ)   $(BASEOBJ)
+IR6 = $(SRC)/imregister.$(ARCH).o   $(IMREG)/args.imregister.$(ARCH).o    $(IMOBJ)   $(BASEOBJ)
+SR1 = $(SRC)/spregister.$(ARCH).o   $(SPREG)/args.spregister.$(ARCH).o    $(SPOBJ)   $(BASEOBJ)
+SR2 = $(SRC)/spsearch.$(ARCH).o     $(SPREG)/args.spsearch.$(ARCH).o      $(SPOBJ)   $(BASEOBJ)
+DR1 = $(SRC)/detregister.$(ARCH).o  $(DETREND)/args.detregister.$(ARCH).o $(DETOBJ)  $(BASEOBJ)
+DR2 = $(SRC)/detsearch.$(ARCH).o    $(DETREND)/args.detsearch.$(ARCH).o   $(DETOBJ)  $(BASEOBJ)
+PR1 = $(SRC)/photreg.$(ARCH).o      $(PHOTREG)/args.photreg.$(ARCH).o     $(PHOTOBJ) $(BASEOBJ)
+PR2 = $(SRC)/photsearch.$(ARCH).o   $(PHOTREG)/args.photsearch.$(ARCH).o  $(PHOTOBJ) $(BASEOBJ)
+
+$(IR1) : $(INC)/imreg.h $(INC)/imregister.h
+$(IR2) : $(INC)/imreg.h $(INC)/imregister.h
+$(IR3) : $(INC)/imreg.h $(INC)/imregister.h
+$(IR4) : $(INC)/imreg.h $(INC)/imregister.h
+$(IR5) : $(INC)/imreg.h $(INC)/imregister.h
+$(IR6) : $(INC)/imreg.h $(INC)/imregister.h
+$(SR1) : $(INC)/spreg.h $(INC)/imregister.h
+$(SR2) : $(INC)/spreg.h $(INC)/imregister.h
+$(DR1) : $(INC)/detrend.h $(INC)/imregister.h
+$(DR2) : $(INC)/detrend.h $(INC)/imregister.h
+$(PR1) : $(INC)/photreg.h $(INC)/imregister.h
+$(PR2) : $(INC)/photreg.h $(INC)/imregister.h
 
 # special rules:
-$(BIN)/photreg.$(ARCH)      : $(SRC)/photreg.$(ARCH).o      $(PR) ; $(CC) $^ -o $@ $(LFLAGS)
-$(BIN)/photsearch.$(ARCH)   : $(SRC)/photsearch.$(ARCH).o   $(PS) ; $(CC) $^ -o $@ $(LFLAGS)
-$(BIN)/imsearch.$(ARCH)     : $(SRC)/imsearch.$(ARCH).o     $(IS) ; $(CC) $^ -o $@ $(LFLAGS)
-$(BIN)/imregister.$(ARCH)   : $(SRC)/imregister.$(ARCH).o   $(IR) ; $(CC) $^ -o $@ $(LFLAGS)
-$(BIN)/imstatreg.$(ARCH)    : $(SRC)/imstatreg.$(ARCH).o    $(IR) ; $(CC) $^ -o $@ $(LFLAGS)
-$(BIN)/showiminfo.$(ARCH)   : $(SRC)/showiminfo.$(ARCH).o   $(IR) ; $(CC) $^ -o $@ $(LFLAGS)
-$(BIN)/imregtable.$(ARCH)   : $(SRC)/imregtable.$(ARCH).o   $(IR) ; $(CC) $^ -o $@ $(LFLAGS)
-$(BIN)/convertimreg.$(ARCH) : $(SRC)/convertimreg.$(ARCH).o $(IR) ; $(CC) $^ -o $@ $(LFLAGS)
-$(BIN)/detregister.$(ARCH)  : $(SRC)/detregister.$(ARCH).o  $(DR) ; $(CC) $^ -o $@ $(LFLAGS)
-$(BIN)/detsearch.$(ARCH)    : $(SRC)/detsearch.$(ARCH).o    $(DS) ; $(CC) $^ -o $@ $(LFLAGS)
+$(BIN)/imsearch.$(ARCH)     : $(IR1)
+$(BIN)/imregister.$(ARCH)   : $(IR2)
+$(BIN)/imstatreg.$(ARCH)    : $(IR3)
+$(BIN)/showiminfo.$(ARCH)   : $(IR4)
+$(BIN)/imregtable.$(ARCH)   : $(IR5)
+$(BIN)/convertimreg.$(ARCH) : $(IR6)
+$(BIN)/detregister.$(ARCH)  : $(DR1)
+$(BIN)/detsearch.$(ARCH)    : $(DR2)
+$(BIN)/photreg.$(ARCH)      : $(PR1)
+$(BIN)/photsearch.$(ARCH)   : $(PR2)
+$(BIN)/spregister.$(ARCH)   : $(SR1)
+$(BIN)/spsearch.$(ARCH)     : $(SR2)
 
-$(BIN)/imsort.$(ARCH)       : $(BIN)/imregister.$(ARCH) ; rm -f $(BIN)/imsort.$(ARCH) ; cp $(BIN)/imregister.$(ARCH) $(BIN)/imsort.$(ARCH) 
+#$(BIN)/imphotsearch.$(ARCH) : $(SRC)/imphotsearch.$(ARCH).o $(IP) ; $(CC) $^ -o $@ $(LFLAGS)
+#$(BIN)/imsort.$(ARCH)       : $(BIN)/imregister.$(ARCH) ; rm -f $(BIN)/imsort.$(ARCH) ; cp $(BIN)/imregister.$(ARCH) $(BIN)/imsort.$(ARCH) 
 
-$(BIN)/spsearch.$(ARCH)     : $(SRC)/spsearch.$(ARCH).o     $(SS) ; $(CC) $^ -o $@ $(LFLAGS)
-$(BIN)/spregister.$(ARCH)   : $(SRC)/spregister.$(ARCH).o   $(SR) ; $(CC) $^ -o $@ $(LFLAGS)
-
-$(BIN)/imphotsearch.$(ARCH) : $(SRC)/imphotsearch.$(ARCH).o $(IP) ; $(CC) $^ -o $@ $(LFLAGS)
-
-# dependancy rules for binary code #########################
-.PRECIOUS: %.$(ARCH).o
-.PRECIOUS: $(BIN)/%.$(ARCH)
-
-%.$(ARCH).o : %.c
-        $(CC) $(CFLAGS) -c $< -o $@
-
-$(BIN)/%.$(ARCH) : $(SRC)/%.$(ARCH).o $(BASEOBJ)
-        @if [ ! -d $(BIN) ]; then mkdir -p $(BIN); fi
-        $(CC) $^ -o $@ $(LFLAGS)
-
-$(DESTBIN)/%: $(BIN)/%.$(ARCH)
-        @if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN); fi
-        rm -f $(DESTBIN)/$*
-        cp $(BIN)/$*.$(ARCH) $(DESTBIN)/$*
-
-$(INSTALL) $(DEVEL): % : $(BIN)/%.$(ARCH)
+# utilities #################################################
 
 %.clean :
@@ -175 +169 @@
         make $(DESTBIN)/$*
 
-# utilities #################################################
-
 install:
         for i in $(INSTALL); do make $$i.install || exit; done
-
-clean:
-        rm -f */*.o
-        rm -f */*~

trunk/Ohana/src/misc/Makefile

@@ +1 @@
+default: misc
+help:
+        @echo "make options: misc (default)"
+
 include ../../Configure
 HOME    =       $(ROOT)/src/misc
-
-default: misc
-
 SRC     =       $(HOME)/src
 LIB     =       $(HOME)/lib
-INC     =       $(HOME)/include
 MAN     =       $(HOME)/doc
 BIN     =       $(HOME)/bin
-DESTBIN =       $(BINDIR)
-DESTLIB =       $(LIBDIR)
-DESTINC =       $(INCDIR)
-DESTMAN =       $(MANDIR)
+INC     =       $(HOME)/include
 
-#  
-CFLAGS  =       -I$(INC) -I$(INCDIR) $(INCDIRS)
-LFLAGS  =       -L$(LIB) -L$(LIBDIR) $(LIBDIRS) -ldvo -lFITS -lohana $(LIBFLAGS) 
+CFLAGS  =       -I$(INC) -I$(DESTINC) $(INCDIRS) -D$(ARCH)
+LDFLAGS =       -L$(LIB) -L$(DESTLIB) $(LIBDIRS) $(LIBFLAGS)
+LDFLAGS :=      -ldvo -lFITS -lohana $(LDFLAGS)
+
+# these are all programs which just depend on a single c file: foo : foo.c
 
 PROGRAMS = gconfig mknames fhead ftable fields list_astro glockfile \
@@ -24 +23 @@
 misc: $(PROGRAMS)
 
-FAKESRC = $(SRC)/fakestars.$(ARCH).o $(SRC)/random.$(ARCH).o
+$(PROGRAMS): % : $(BIN)/%.$(ARCH)
 
-$(BIN)/fakestars.$(ARCH): $(FAKESRC)
-        @if [ ! -d $(BIN) ]; then mkdir -p $(BIN); fi
-        $(CC) -o $(BIN)/fakestars.$(ARCH) $(FAKESRC) $(LIBS) $(CCFLAGS)
+fakestars: $(BIN)/fakestars.$(ARCH)
+$(BIN)/fakestars.$(ARCH): $(SRC)/fakestars.$(ARCH).o $(SRC)/random.$(ARCH).o
 
-fakestars: $(DESTBIN)/fakestars
+#### cfhtlog is special (requires additional libs and includes)
 
 $(BIN)/cfhtlog.$(ARCH): $(SRC)/cfhtlog.c
@@ -42 +40 @@
         make $(DESTBIN)/cfhtlog
 
-$(PROGRAMS): % : $(BIN)/%.$(ARCH)
-
-# dependancy rules for binary code #########################
+# copied from Makefile.Common : use a single c file: foo : foo.c
 .PRECIOUS: %.$(ARCH).o
 .PRECIOUS: $(BIN)/%.$(ARCH)
 
 %.$(ARCH).o : %.c
-        $(CC) $(CFLAGS) -c $< -o $@ 
+        $(CC) $(CFLAGS) -c $< -o $@
 
 $(BIN)/%.$(ARCH) : $(SRC)/%.$(ARCH).o
         @if [ ! -d $(BIN) ]; then mkdir -p $(BIN); fi
-        $(CC) $^ -o $@ $(LFLAGS)
+        $(CC) -o $@ $^ $(LDFLAGS)
 
-$(DESTBIN)/%: $(BIN)/%.$(ARCH)
+$(DESTBIN)/%: $(BIN)/%.$(ARCH) 
         @if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN); fi
         rm -f $(DESTBIN)/$*
@@ -63 +59 @@
         make $(DESTBIN)/$*
 
+install:
+        for i in $(PROGRAMS); do make $$i.install || exit; done
+
 %.clean:
         rm -f $(SRC)/$*.$(ARCH).o
         rm -f $(BIN)/$*.$(ARCH)
 
-# utilities #################################################
+clean:
+        rm -f `find . -name "*.o"`
+        rm -f `find . -name "*.o"`
+        rm -f `find . -name "*~"`
+        rm -f `find . -name "#*"`
 
-install:
-        for i in $(PROGRAMS); do make $$i.install || exit; done
-
-clean:
-        for i in $(PROGRAMS); do make $$i.clean; done
-        rm -f */*~
-        rm -f */#*
-        rm -f *~
-        rm -f #*
-
+dist: clean
+        rm -rf $(BIN)
+        rm -rf $(LIB)

trunk/Ohana/src/opihi/dvo/Makefile

@@ -82 +82 @@
 $(DESTLIB)/libdatacmd.a
 
-dvo: $(BIN)/dvo.$(ARCH) $(libs)
+dvo: $(BIN)/dvo.$(ARCH)
 
-$(BIN)/dvo.$(ARCH) : $(funcs) $(cmds)
+$(BIN)/dvo.$(ARCH) : $(funcs) $(cmds) $(libs)
 
 install: $(DESTBIN)/dvo help

trunk/Ohana/src/opihi/mana/Makefile

@@ -36 +36 @@
 $(DESTLIB)/libdatacmd.a
 
-mana: $(BIN)/mana.$(ARCH) $(libs)
+mana: $(BIN)/mana.$(ARCH) 
 
+### fix this: this is adding libdatacmd.a, etc, to the compile line
+### (because $(libs) is a dep and included by the Makefile.Common rul
+### (BUT without this line, mana does not get compiled if changes happen
+### to libdatacmd.a 
+$(BIN)/mana.$(ARCH) : $(libs)
 $(BIN)/mana.$(ARCH) : $(mana)
 
 install: $(DESTBIN)/mana help
 
-help: clean-help cmd.basic.help cmd.data.help cmd.astro.help mana.help
+help: clean-help cmd.basic.help cmd.data.help cmd.astro.help
+# mana.help
 
 .PHONY: mana