Changeset 10305 for trunk/Ohana/src/opihi
- Timestamp:
- Nov 29, 2006, 3:59:20 PM (20 years ago)
- Location:
- trunk/Ohana/src/opihi
- Files:
-
- 11 edited
-
cmd.astro/Makefile (modified) (1 diff)
-
cmd.basic/Makefile (modified) (1 diff)
-
cmd.data/Makefile (modified) (2 diffs)
-
dimm/Makefile (modified) (2 diffs)
-
dvo/Makefile (modified) (2 diffs)
-
lib.data/Makefile (modified) (1 diff)
-
lib.shell/Makefile (modified) (1 diff)
-
mana/Makefile (modified) (2 diffs)
-
pantasks/Makefile (modified) (2 diffs)
-
pclient/Makefile (modified) (2 diffs)
-
pcontrol/Makefile (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Ohana/src/opihi/cmd.astro/Makefile
r7964 r10305 7 7 SDIR = $(HOME)/cmd.astro 8 8 # 9 DESTBIN = $(LBIN) 10 DESTLIB = $(LLIB) 11 DESTINC = $(LINC) 12 DESTMAN = $(LMAN) 13 HELP = $(HOME)/help 9 DESTBIN = $(BINDIR) 10 DESTLIB = $(LIBDIR) 11 DESTINC = $(INCDIR) 12 DESTMAN = $(MANDIR) 14 13 # 15 INCS = -I$(INC) -I$(LINC) -I$(XINC) 16 CFLAGS = $(INCS) 14 CFLAGS = -I$(INC) -I$(INCDIR) $(INCDIRS) 17 15 18 16 # astro user commands ######################## -
trunk/Ohana/src/opihi/cmd.basic/Makefile
r8189 r10305 7 7 SDIR = $(HOME)/cmd.basic 8 8 # 9 DESTBIN = $( LBIN)10 DESTLIB = $(L LIB)11 DESTINC = $( LINC)12 DESTMAN = $( LMAN)13 HELP = $(HOME)/help 9 DESTBIN = $(BINDIR) 10 DESTLIB = $(LIBDIR) 11 DESTINC = $(INCDIR) 12 DESTMAN = $(MANDIR) 13 14 14 # 15 INCS = -I$(INC) -I$(LINC) -I$(XINC) 16 CFLAGS = $(INCS) 15 CFLAGS = -I$(INC) -I$(INCDIR) $(INCDIRS) 17 16 18 17 # basic user commands ######################## -
trunk/Ohana/src/opihi/cmd.data/Makefile
r10072 r10305 7 7 SDIR = $(HOME)/cmd.data 8 8 # 9 DESTBIN = $(LBIN) 10 DESTLIB = $(LLIB) 11 DESTINC = $(LINC) 12 DESTMAN = $(LMAN) 13 HELP = $(HOME)/help 9 DESTBIN = $(BINDIR) 10 DESTLIB = $(LIBDIR) 11 DESTINC = $(INCDIR) 12 DESTMAN = $(MANDIR) 14 13 # 15 INCS = -I$(INC) -I$(LINC) -I$(XINC) 16 CFLAGS = $(INCS) 14 CFLAGS = -I$(INC) -I$(INCDIR) $(INCDIRS) 17 15 18 16 # data user commands ######################## … … 30 28 $(SDIR)/contour.$(ARCH).o \ 31 29 $(SDIR)/create.$(ARCH).o \ 30 $(SDIR)/cumulative.$(ARCH).o \ 32 31 $(SDIR)/cursor.$(ARCH).o \ 33 32 $(SDIR)/cut.$(ARCH).o \ -
trunk/Ohana/src/opihi/dimm/Makefile
r10072 r10305 7 7 SDIR = $(HOME)/dimm 8 8 # 9 DESTBIN = $( LBIN)10 DESTLIB = $(L LIB)11 DESTINC = $( LINC)12 DESTMAN = $( LMAN)13 DESTHLP = $( LHLP)/dimm9 DESTBIN = $(BINDIR) 10 DESTLIB = $(LIBDIR) 11 DESTINC = $(INCDIR) 12 DESTMAN = $(MANDIR) 13 DESTHLP = $(HELPDIR)/dimm 14 14 15 15 # compile flags 16 INCS = -I$(INC) -I$(LINC) -I$(XINC) 17 CFLAGS = $(INCS) -DHELPDIR_DEFAULT=$(DESTHLP) 16 CFLAGS = -I$(INC) -I$(INCDIR) $(INCDIRS) -DHELPDIR_DEFAULT=$(DESTHLP) 18 17 19 18 # link flags 20 LIBS = -L$(LIB) -L$(LLIB) -L$(XLIB) 21 LIBS1 = -lsocket -lnsl -lreadline $(TLIB) -ljpeg -ldvo -lkapa -lFITS -lohana -lX11 -lm 19 LIBS1 = -ldvo -lkapa -lFITS -lohana $(LIBFLAGS) 22 20 LIBS2 = -lbasiccmd -ldatacmd -lastrocmd -lshell -ldata -lsbig 23 LFLAGS = $(LIBS) $(LIBS2) $(LIBS1)21 LFLAGS = -L$(LIB) -L$(LIBDIR) $(LIBDIRS) $(LIBS2) $(LIBS1) 24 22 25 23 # dimm user commands and support functions ##################### … … 47 45 $(DESTLIB)/libsbig.a 48 46 49 dimm: sbig $(BIN)/dimm.$(ARCH) 47 dimm: sbig $(BIN)/dimm.$(ARCH) $(libs) 50 48 51 $(BIN)/dimm.$(ARCH) : $(funcs) $(cmds) $(libs)49 $(BIN)/dimm.$(ARCH) : $(funcs) $(cmds) 52 50 53 51 install: $(DESTBIN)/dimm help -
trunk/Ohana/src/opihi/dvo/Makefile
r10072 r10305 7 7 SDIR = $(HOME)/dvo 8 8 # 9 DESTBIN = $( LBIN)10 DESTLIB = $(L LIB)11 DESTINC = $( LINC)12 DESTMAN = $( LMAN)13 DESTHLP = $( LHLP)/dvo9 DESTBIN = $(BINDIR) 10 DESTLIB = $(LIBDIR) 11 DESTINC = $(INCDIR) 12 DESTMAN = $(MANDIR) 13 DESTHLP = $(HELPDIR)/dvo 14 14 15 15 # compile flags 16 INCS = -I$(INC) -I$(LINC) -I$(XINC) 17 CFLAGS = $(INCS) -DHELPDIR_DEFAULT=$(DESTHLP) 16 CFLAGS = -I$(INC) -I$(INCDIR) $(INCDIRS) -DHELPDIR_DEFAULT=$(DESTHLP) 18 17 19 18 # link flags 20 LIBS = -L$(LIB) -L$(LLIB) -L$(XLIB) 21 LIBS1 = -lsocket -lnsl -lreadline $(TLIB) -ljpeg -ldvo -lkapa -lFITS -lohana -lX11 -lm 19 LIBS1 = -ldvo -lkapa -lFITS -lohana $(LIBFLAGS) 22 20 LIBS2 = -lbasiccmd -ldatacmd -lastrocmd -lshell -ldata 23 LFLAGS = $(LIBS) $(LIBS2) $(LIBS1)21 LFLAGS = -L$(LIB) -L$(LIBDIR) $(LIBDIRS) $(LIBS2) $(LIBS1) 24 22 25 23 # dvo user commands and support functions ######################## … … 92 90 $(DESTLIB)/libdatacmd.a 93 91 94 dvo: $(BIN)/dvo.$(ARCH) 92 dvo: $(BIN)/dvo.$(ARCH) $(libs) 95 93 96 $(BIN)/dvo.$(ARCH) : $(funcs) $(cmds) $(libs)94 $(BIN)/dvo.$(ARCH) : $(funcs) $(cmds) 97 95 98 96 install: $(DESTBIN)/dvo help -
trunk/Ohana/src/opihi/lib.data/Makefile
r8297 r10305 7 7 SDIR = $(HOME)/lib.data 8 8 # 9 DESTBIN = $(LBIN) 10 DESTLIB = $(LLIB) 11 DESTINC = $(LINC) 12 DESTMAN = $(LMAN) 13 HELP = $(HOME)/help 9 DESTBIN = $(BINDIR) 10 DESTLIB = $(LIBDIR) 11 DESTINC = $(INCDIR) 12 DESTMAN = $(MANDIR) 14 13 # 15 INCS = -I$(INC) -I$(LINC) -I$(XINC) 16 CFLAGS = $(INCS) 14 CFLAGS = -I$(INC) -I$(INCDIR) $(INCDIRS) 17 15 18 16 # general numerical functions (libdata) ##################### -
trunk/Ohana/src/opihi/lib.shell/Makefile
r7938 r10305 7 7 SDIR = $(HOME)/lib.shell 8 8 # 9 DESTBIN = $(LBIN) 10 DESTLIB = $(LLIB) 11 DESTINC = $(LINC) 12 DESTMAN = $(LMAN) 13 HELP = $(HOME)/help 9 DESTBIN = $(BINDIR) 10 DESTLIB = $(LIBDIR) 11 DESTINC = $(INCDIR) 12 DESTMAN = $(MANDIR) 14 13 # 15 INCS = -I$(INC) -I$(LINC) -I$(XINC) 16 CFLAGS = $(INCS) 14 CFLAGS = -I$(INC) -I$(INCDIR) $(INCDIRS) 17 15 18 16 # opihi shell functions (libopihi) ######################## -
trunk/Ohana/src/opihi/mana/Makefile
r9726 r10305 7 7 SDIR = $(HOME)/mana 8 8 # 9 DESTBIN = $( LBIN)10 DESTLIB = $(L LIB)11 DESTINC = $( LINC)12 DESTMAN = $( LMAN)13 DESTHLP = $( LHLP)/mana9 DESTBIN = $(BINDIR) 10 DESTLIB = $(LIBDIR) 11 DESTINC = $(INCDIR) 12 DESTMAN = $(MANDIR) 13 DESTHLP = $(HELPDIR)/mana 14 14 15 15 # compile flags 16 INCS = -I$(INC) -I$(LINC) -I$(XINC) 17 CFLAGS = $(INCS) -DHELPDIR_DEFAULT=$(DESTHLP) 16 CFLAGS = -I$(INC) -I$(INCDIR) $(INCDIRS) -DHELPDIR_DEFAULT=$(DESTHLP) 18 17 19 18 # link flags 20 LIBS = -L$(LIB) -L$(LLIB) -L$(XLIB) 21 LIBS1 = -lsocket -lnsl -lreadline $(TLIB) -ljpeg -ldvo -lkapa -lFITS -lohana -lX11 -lpthread -lm 22 # LIBS1 = -lreadline $(TLIB) -ldvo -lkapa -lFITS -lohana -lX11 -lm 19 LIBS1 = -ldvo -lkapa -lFITS -lohana $(LIBFLAGS) 23 20 LIBS2 = -lbasiccmd -ldatacmd -lastrocmd -lshell -ldata 24 LFLAGS = $(LIBS) $(LIBS2) $(LIBS1)21 LFLAGS = -L$(LIB) -L$(LIBDIR) $(LIBDIRS) $(LIBS2) $(LIBS1) 25 22 26 23 # mana user commands and support functions ######################## … … 47 44 $(DESTLIB)/libdatacmd.a 48 45 49 mana: $(BIN)/mana.$(ARCH) 46 mana: $(BIN)/mana.$(ARCH) $(libs) 50 47 51 $(BIN)/mana.$(ARCH) : $(mana) $(libs)48 $(BIN)/mana.$(ARCH) : $(mana) 52 49 53 50 install: $(DESTBIN)/mana help -
trunk/Ohana/src/opihi/pantasks/Makefile
r10072 r10305 7 7 SDIR = $(HOME)/pantasks 8 8 # 9 DESTBIN = $( LBIN)10 DESTLIB = $(L LIB)11 DESTINC = $( LINC)12 DESTMAN = $( LMAN)13 DESTHLP = $( LHLP)/pantasks9 DESTBIN = $(BINDIR) 10 DESTLIB = $(LIBDIR) 11 DESTINC = $(INCDIR) 12 DESTMAN = $(MANDIR) 13 DESTHLP = $(HELPDIR)/pantasks 14 14 15 15 # compile flags 16 INCS = -I$(INC) -I$(LINC) -I$(XINC) 17 CFLAGS = $(INCS) -DHELPDIR_DEFAULT=$(DESTHLP) 16 CFLAGS = -I$(INC) -I$(INCDIR) $(INCDIRS) -DHELPDIR_DEFAULT=$(DESTHLP) 18 17 19 18 # link flags 20 LIBS = -L$(LIB) -L$(LLIB) -L$(XLIB) 21 LIBS1 = -lsocket -lnsl -lreadline $(TLIB) -ljpeg -ldvo -lkapa -lFITS -lohana -lX11 -lpthread -lm 19 LIBS1 = -ldvo -lkapa -lFITS -lohana $(LIBFLAGS) 22 20 LIBS2 = -lbasiccmd -ldatacmd -lastrocmd -lshell -ldata 23 LFLAGS = $(LIBS) $(LIBS2) $(LIBS1)21 LFLAGS = -L$(LIB) -L$(LIBDIR) $(LIBDIRS) $(LIBS2) $(LIBS1) 24 22 25 23 # sched user commands and support functions ######################## … … 93 91 $(DESTLIB)/libdatacmd.a 94 92 95 pantasks: $(BIN)/pantasks.$(ARCH) 96 $(BIN)/pantasks.$(ARCH) : $(single) $(funcs) $(cmds) $(libs)93 pantasks: $(BIN)/pantasks.$(ARCH) $(libs) 94 $(BIN)/pantasks.$(ARCH) : $(single) $(funcs) $(cmds) 97 95 98 pantasks_client: $(BIN)/pantasks_client.$(ARCH) 99 $(BIN)/pantasks_client.$(ARCH) : $(client) $(libs)96 pantasks_client: $(BIN)/pantasks_client.$(ARCH) $(libs) 97 $(BIN)/pantasks_client.$(ARCH) : $(client) 100 98 101 pantasks_server: $(BIN)/pantasks_server.$(ARCH) 102 $(BIN)/pantasks_server.$(ARCH) : $(server) $(funcs) $(cmds) $(libs)99 pantasks_server: $(BIN)/pantasks_server.$(ARCH) $(libs) 100 $(BIN)/pantasks_server.$(ARCH) : $(server) $(funcs) $(cmds) 103 101 @if [ ! -d $(BIN) ]; then mkdir -p $(BIN); fi 104 102 $(CC) -o $@ $^ $(LFLAGS) -
trunk/Ohana/src/opihi/pclient/Makefile
r10072 r10305 7 7 SDIR = $(HOME)/pclient 8 8 # 9 DESTBIN = $( LBIN)10 DESTLIB = $(L LIB)11 DESTINC = $( LINC)12 DESTMAN = $( LMAN)13 DESTHLP = $( LHLP)/pclient9 DESTBIN = $(BINDIR) 10 DESTLIB = $(LIBDIR) 11 DESTINC = $(INCDIR) 12 DESTMAN = $(MANDIR) 13 DESTHLP = $(HELPDIR)/pclient 14 14 15 15 # compile flags 16 INCS = -I$(INC) -I$(LINC) -I$(XINC) 17 CFLAGS = $(INCS) -DHELPDIR_DEFAULT=$(DESTHLP) 16 CFLAGS = -I$(INC) -I$(INCDIR) $(INCDIRS) -DHELPDIR_DEFAULT=$(DESTHLP) 18 17 19 18 # link flags 20 LIBS = -L$(LIB) -L$(LLIB) -L$(XLIB) 21 LIBS1 = -lsocket -lnsl -lreadline $(TLIB) -ldvo -lkapa -lFITS -lohana -lX11 -lm 19 LIBS1 = -ldvo -lkapa -lFITS -lohana $(LIBFLAGS) 22 20 LIBS2 = -lbasiccmd -lshell -ldata 23 LFLAGS = $(LIBS) $(LIBS2) $(LIBS1)21 LFLAGS = -L$(LIB) -L$(LIBDIR) $(LIBDIRS) $(LIBS2) $(LIBS1) 24 22 25 23 # mana user commands and support functions ######################## … … 43 41 $(DESTLIB)/libdata.a 44 42 45 pclient: $(BIN)/pclient.$(ARCH) 43 pclient: $(BIN)/pclient.$(ARCH) $(libs) 46 44 47 $(BIN)/pclient.$(ARCH) : $(funcs) $(cmds) $(libs)45 $(BIN)/pclient.$(ARCH) : $(funcs) $(cmds) 48 46 49 47 install: $(DESTBIN)/pclient help -
trunk/Ohana/src/opihi/pcontrol/Makefile
r8546 r10305 7 7 SDIR = $(HOME)/pcontrol 8 8 # 9 DESTBIN = $( LBIN)10 DESTLIB = $(L LIB)11 DESTINC = $( LINC)12 DESTMAN = $( LMAN)13 DESTHLP = $( LHLP)/pcontrol9 DESTBIN = $(BINDIR) 10 DESTLIB = $(LIBDIR) 11 DESTINC = $(INCDIR) 12 DESTMAN = $(MANDIR) 13 DESTHLP = $(HELPDIR)/pcontrol 14 14 15 15 # compile flags 16 INCS = -I$(INC) -I$(LINC) -I$(XINC) 17 CFLAGS = $(INCS) -DHELPDIR_DEFAULT=$(DESTHLP) 16 CFLAGS = -I$(INC) -I$(INCDIR) $(INCDIRS) -DHELPDIR_DEFAULT=$(DESTHLP) 18 17 19 18 # link flags 20 LIBS = -L$(LIB) -L$(LLIB) -L$(XLIB) 21 LIBS1 = -lsocket -lnsl -lreadline $(TLIB) -lkapa -lFITS -lohana -lX11 -lpthread -lm 19 LIBS1 = -lkapa -lFITS -lohana $(LIBFLAGS) 22 20 LIBS2 = -lbasiccmd -lshell -ldata 23 LFLAGS = $(LIBS) $(LIBS2) $(LIBS1)21 LFLAGS = -L$(LIB) -L$(LIBDIR) $(LIBDIRS) $(LIBS2) $(LIBS1) 24 22 25 23 # to build the non-threaded version, remove -lpthread and comment out … … 74 72 $(DESTLIB)/libdata.a 75 73 76 pcontrol: $(BIN)/pcontrol.$(ARCH) 74 pcontrol: $(BIN)/pcontrol.$(ARCH) $(libs) 77 75 78 $(BIN)/pcontrol.$(ARCH) : $(pcontrol) $(libs)76 $(BIN)/pcontrol.$(ARCH) : $(pcontrol) 79 77 80 78 install: $(DESTBIN)/pcontrol help
Note:
See TracChangeset
for help on using the changeset viewer.
