X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=sim%2Fucsim%2Fsim.src%2FMakefile.in;h=9bfd6468721e1cbd7ebbe9cd6456446689151b65;hb=8c8f34ff4281a55d2f535335c02999246e9e12f2;hp=98fed8ecfc04bb0bb6f8bcd93806f3c150ad90ec;hpb=80b2a5b23482ecbc28c3f70566ecafa524169016;p=fw%2Fsdcc

diff --git a/sim/ucsim/sim.src/Makefile.in b/sim/ucsim/sim.src/Makefile.in
index 98fed8ec..9bfd6468 100644
--- a/sim/ucsim/sim.src/Makefile.in
+++ b/sim/ucsim/sim.src/Makefile.in
@@ -34,16 +34,16 @@ man2dir         = $(mandir)/man2
 infodir         = @infodir@
 srcdir          = @srcdir@
 
-OBJECTS         = app.o sim.o itsrc.o brk.o option.o arg.o stack.o \
-		  guiobj.o uc.o hw.o mem.o
+OBJECTS         = mem.o app.o sim.o itsrc.o brk.o option.o arg.o stack.o \
+		  guiobj.o uc.o hw.o
 
 
 # Compiling entire program or any subproject
 # ------------------------------------------
 all: checkconf sim_lib
 
-test_mem_speed: $(PRJDIR)/libsim.a $(PRJDIR)/libutil.a test_mem_speed.o
-	$(CC) -o $@ test_mem_speed.o -L$(PRJDIR) -lsim -lutil
+test_mem_speed: $(PRJDIR)/lib*.a test_mem_speed.o
+	$(CC) -o $@ test_mem_speed.o -L$(PRJDIR) -lsim -lutil -lcmd -lsim
 
 sim.src: all
 
@@ -60,8 +60,10 @@ uninstall:
 
 # Performing self-test
 # --------------------
-check:
+check: test
+	./test_mem_speed
 
+test: test_mem_speed
 
 # Performing installation test
 # ----------------------------
@@ -73,8 +75,6 @@ installcheck:
 installdirs:
 
 
-test: test_mem_speed
-
 # Creating dependencies
 # ---------------------
 dep: main.dep
@@ -95,7 +95,7 @@ include clean.mk
 sim_lib: $(PRJDIR)/libsim.a
 
 $(PRJDIR)/libsim.a: $(OBJECTS)
-	$(AR) -rcu $*.a $(OBJECTS)
+	ar -rcu $*.a $(OBJECTS)
 	$(RANLIB) $*.a
 
 .cc.o: