Changeset 3649 for trunk/Ohana/src/misc/Makefile

Timestamp:

Apr 3, 2005, 9:11:15 PM (21 years ago)

Author:

eugene

Message:

cleaning up fsetlockfile / fclearlockfile (dropped setlockfile2/clearlockfile2)

File:

• trunk/Ohana/src/misc/Makefile (modified) (4 diffs)

trunk/Ohana/src/misc/Makefile

@@ -16 +16 @@
 #  
 INCS    =       -I$(LINC) -I$(XINC)
-LIBS    =       -L$(LLIB) -lFITS -lohana -lm
-CFLAGS  =       
-CCFLAGS =       $(INCS) $(LIBS) 
+LIBS    =       -L$(LLIB) -lohana -lFITS -lm
+CFLAGS  =       $(INCS)
+LFLAGS  =       $(LIBS)
 
 PROGRAMS = gconfig mknames fhead ftable fields list_astro glockfile \
@@ -24 +24 @@
 medianfilter mefhead mkfringetable gtfringetable ckfits applyscat fiximg
 
-CFHT = cfhtlog
-
-$(CFHT): 
-        make $(BIN)/$@.$(ARCH)
-
-$(PROGRAMS):
-        make $(BIN)/$@.$(ARCH)
-
 misc: $(PROGRAMS)
-
-clean:
-        for i in $(PROGRAMS); do make $$i.clean; done
-        rm -f */*~
-        rm -f */#*
-        rm -f *~
-        rm -f #*
-
-install:
-        for i in $(PROGRAMS); do make $$i.install; done
 
 FAKESRC = $(SRC)/fakestars.$(ARCH).o $(SRC)/random.$(ARCH).o
@@ -50 +32 @@
         $(CC) -o $(BIN)/fakestars.$(ARCH) $(FAKESRC) $(LIBS) $(CCFLAGS)
 
-fakestars: $(BIN)/fakestars.$(ARCH)
-        cp $(BIN)/fakestars.$(ARCH) $(DESTBIN)/fakestars
+fakestars: $(DESTBIN)/fakestars
 
-$(DESTBIN)/cfhtlog: $(SRC)/cfhtlog.$(ARCH)
+$(BIN)/cfhtlog.$(ARCH): $(SRC)/cfhtlog.c
+        $(CC) -I/cfht/include -L/cfht/lib -o $(BIN)/cfhtlog.$(ARCH) $(SRC)/cfhtlog.c -lcfht 
+
+$(DESTBIN)/cfhtlog: $(BIN)/cfhtlog.$(ARCH)
         @if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN); fi
         cp $(SRC)/cfhtlog.$(ARCH) $(DESTBIN)/
 
-cfhtlog: $(SRC)/cfhtlog.$(ARCH)
-$(SRC)/cfhtlog.$(ARCH): $(SRC)/cfhtlog.c
-        $(CC) -I/cfht/include -L/cfht/lib -o $(SRC)/cfhtlog.$(ARCH) $(SRC)/cfhtlog.c -lcfht 
+cfhtlog:
+        make $(DESTBIN)/cfhtlog
 
-# RULES for making & installing
+$(PROGRAMS): % : $(BIN)/%.$(ARCH)
+
+# dependancy rules for binary code #########################
+.PRECIOUS: %.$(ARCH).o
+.PRECIOUS: $(BIN)/%.$(ARCH)
 
 %.$(ARCH).o : %.c
-        $(CC) $(INCS) -o $*.$(ARCH).o -c $< 
-
-$(SRC)/%.$(ARCH).o : %.c
-        $(CC) $(INCS) -o $*.$(ARCH).o -c $< 
+        $(CC) $(CFLAGS) -c $< -o $@ 
 
 $(BIN)/%.$(ARCH) : $(SRC)/%.$(ARCH).o
         @if [ ! -d $(BIN) ]; then mkdir -p $(BIN); fi
-        $(CC) $^ -o $@ $(LIBS)
+        $(CC) $^ -o $@ $(LFLAGS)
 
 $(DESTBIN)/%: $(BIN)/%.$(ARCH)
@@ -84 +68 @@
         rm -f $(SRC)/$*.$(ARCH).o
         rm -f $(BIN)/$*.$(ARCH)
+
+# utilities #################################################
+
+install:
+        for i in $(PROGRAMS); do make $$i.install; done
+
+clean:
+        for i in $(PROGRAMS); do make $$i.clean; done
+        rm -f */*~
+        rm -f */#*
+        rm -f *~
+        rm -f #*
+