X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=sim%2Fucsim%2Fmain_in.mk;h=3a77bac642c240f6f3ade5f5e4faa5f86fea765f;hb=f1c40004ae349f7cd3a1a5c5c85f62f695196370;hp=d7f2715b04d07ba5210784e2371e98b7bc59158f;hpb=0e1bba0730e55b3d40c1c644d94befc99c87270d;p=fw%2Fsdcc

diff --git a/sim/ucsim/main_in.mk b/sim/ucsim/main_in.mk
index d7f2715b..3a77bac6 100644
--- a/sim/ucsim/main_in.mk
+++ b/sim/ucsim/main_in.mk
@@ -26,8 +26,10 @@ CFLAGS          = @CFLAGS@ -I$(PRJDIR) -Wall
 CXXFLAGS        = @CXXFLAGS@ -I$(PRJDIR) -Wall
 M_OR_MM         = @M_OR_MM@
 
-LIB_LIST	= util sim cmd sim
-UCSIM_LIBS	= $(patsubst %,-l%,$(LIB_LIST))
+EXEEXT		= @EXEEXT@
+
+LIB_LIST	= util cmd sim
+UCSIM_LIBS	= -Wl,--start-group $(patsubst %,-l%,$(LIB_LIST)) -Wl,--end-group
 UCSIM_LIB_FILES	= $(patsubst %,lib%.a,$(LIB_LIST))
 
 prefix          = @prefix@
@@ -67,10 +69,10 @@ install: all installdirs
 # Deleting all the installed files
 # --------------------------------
 uninstall:
-	rm -f $(bindir)/s51
-	rm -f $(bindir)/savr
-	rm -f $(bindir)/serialview
-	rm -f $(bindir)/portmon
+	rm -f $(DESTDIR)$(bindir)/s51$(EXEEXT)
+	rm -f $(DESTDIR)$(bindir)/savr$(EXEEXT)
+	rm -f $(DESTDIR)$(bindir)/serialview$(EXEEXT)
+	rm -f $(DESTDIR)$(bindir)/portmon$(EXEEXT)
 
 
 # Performing self-test
@@ -120,25 +122,17 @@ ucsim: $(UCSIM_OBJECTS) $(UCSIM_LIB_FILES)
 	echo $(UCSIM_LIB_FILES)
 	$(CXX) $(CXXFLAGS) -o $@ $< -L$(PRJDIR) $(UCSIM_LIBS)
 
+ptt: ptt.o
+	$(CXX) $(CXXFLAGS) -o $@ $< -lpthread
 .cc.o:
 	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $< -o $@
 
-.y.cc:
-	rm -f $*.cc $*.h
-	$(YACC) -d $<
-	mv y.tab.c $*.cc
-	mv y.tab.h $*.h
-
-.l.cc:
-	rm -f $*.cc
-	$(LEX) -t $< >$*.cc
-
 
 # Remaking configuration
 # ----------------------
 checkconf:
 	@if [ -f devel ]; then\
-	  echo "MAIN.MK checkconf";\
+	  $(PRJDIR)/mkecho $(PRJDIR) "MAIN.MK checkconf";\
 	  $(MAKE) -f conf.mk srcdir="$(srcdir)" freshconf;\
 	fi