Index: trunk/util/gsch2pcb-rnd/Makefile.in =================================================================== --- trunk/util/gsch2pcb-rnd/Makefile.in (revision 34720) +++ trunk/util/gsch2pcb-rnd/Makefile.in (revision 34721) @@ -16,14 +16,11 @@ CFLAGS=@/local/pcb/c89flags@ @/local/pcb/CFLAGS@ $(CFLAGS_LIBRND_FUNGW) LDFLAGS=-lm @/local/pcb/LDFLAGS@ $(LDFLAGS_LIBRND_FUNGW) +LDF_LIBRND=-lrnd-hid -lrnd-3rd CC=@cc/cc@ -LIB_HIDLIB=\ - $(ROOT)/src_3rd/librnd-local/src/librnd-hid.a \ - $(ROOT)/src_3rd/librnd-local/src/librnd-3rd.a @] print [@ -LISTOBJ=../../src_3rd/librnd-local/src_3rd/genlist/genadlist.o ../../src_3rd/librnd-local/src_3rd/genlist/genlistalloc.o QPARSE=../../src_3rd/qparse/qparse.o @] @@ -61,8 +58,8 @@ revcheck: cd ../../scconfig && ./revtest Rev.stamp < Rev.tab -gsch2pcb-rnd$(LIBRND_EXE): $(OBJS) $(HASHOBJ) $(LISTOBJ) $(QPARSE) $(FP_OBJS) $(LIB_HIDLIB) - $(CC) $(OBJS) $(FP_OBJS) $(HASHOBJ) $(LISTOBJ) $(QPARSE) $(LIB_HIDLIB) -o gsch2pcb-rnd$(LIBRND_EXE) $(LDFLAGS) $(FP_LDFLAGS) +gsch2pcb-rnd$(LIBRND_EXE): $(OBJS) $(QPARSE) $(FP_OBJS) + $(CC) $(OBJS) $(FP_OBJS) $(QPARSE) -o gsch2pcb-rnd$(LIBRND_EXE) $(LDF_LIBRND) $(LDFLAGS) $(FP_LDFLAGS) gsch2pcb.o: gsch2pcb.c ../../config.h $(CC) -c $(CFLAGS) $(FP_CFLAGS) gsch2pcb.c -o gsch2pcb.o @@ -69,17 +66,9 @@ # TODO: this should be the base lib only # run the Makefile in src for the common objects: -$(HASHOBJ) $(QPARSE) \ -../../src_3rd/librnd-local/src_3rd/genadlist/genlist.o \ -../../src_3rd/librnd-local/src_3rd/genlist/genlistalloc.o: +$(QPARSE): cd ../../src && $(MAKE) util_deps -$(ROOT)/src_3rd/librnd-local/src/librnd-hid.a: - cd $(ROOT)/src_3rd/librnd-local && make librnd-hid.a - -$(ROOT)/src_3rd/librnd-local/src/librnd-3rd.a: - cd $(ROOT)/src_3rd/librnd-local && make librnd-3rd.a - ##### module rules begin ##### @/local/pcb/RULES@ ##### module rules end #####