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

diff --git a/sim/ucsim/main_in.mk b/sim/ucsim/main_in.mk
index a1442a74..3a77bac6 100644
--- a/sim/ucsim/main_in.mk
+++ b/sim/ucsim/main_in.mk
@@ -15,18 +15,22 @@ INSTALL		= @INSTALL@
 
 PRJDIR		= .
 SIMDIR		= sim.src
+CMDDIR		= cmd.src
+GUIDIR		= gui.src
 
 DEFS            = $(subs -DHAVE_CONFIG_H,,@DEFS@)
 # FIXME: -Imcs51 must be removed!!!
-CPPFLAGS        = @CPPFLAGS@ -I$(PRJDIR) -I$(PRJDIR)/$(SIMDIR)
+CPPFLAGS        = @CPPFLAGS@ -I$(PRJDIR) -I$(PRJDIR)/$(SIMDIR) \
+		  -I$(CMDDIR) -I$(GUIDIR)
 CFLAGS          = @CFLAGS@ -I$(PRJDIR) -Wall
 CXXFLAGS        = @CXXFLAGS@ -I$(PRJDIR) -Wall
 M_OR_MM         = @M_OR_MM@
 
-LIB_LIST	= sim cmd sim util
-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))
-LIBS		= @LIBS@
 
 prefix          = @prefix@
 exec_prefix     = @exec_prefix@
@@ -40,12 +44,14 @@ man2dir         = $(mandir)/man2
 infodir         = @infodir@
 srcdir          = @srcdir@
 
-OBJECTS         = pobj.o globals.o utils.o
+OBJECTS         = pobj.o globals.o utils.o error.o app.o option.o
 SOURCES		= $(patsubst %.o,%.cc,$(OBJECTS))
 UCSIM_OBJECTS	= ucsim.o
 UCSIM_SOURCES	= $(patsubst %.o,%.cc,$(UCSIM_OBJECTS))
 ALL_SOURCES	= $(SOURCES) $(UCSIM_SOURCES)
 
+enable_ucsim	= @enable_ucsim@
+
 
 # Compiling entire program or any subproject
 # ------------------------------------------
@@ -63,16 +69,17 @@ 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
 # --------------------
 check:
 
+test:
 
 # Performing installation test
 # ----------------------------
@@ -104,31 +111,28 @@ libutil.a: $(OBJECTS)
 	ar -rcu $*.a $(OBJECTS)
 	$(RANLIB) $*.a
 
+
+ifeq ($(enable_ucsim),yes)
 ucsim_app: libs ucsim
+else
+ucsim_app:
+endif
 
 ucsim: $(UCSIM_OBJECTS) $(UCSIM_LIB_FILES)
 	echo $(UCSIM_LIB_FILES)
-	$(CXX) $(CXXFLAGS) -o $@ $< -L$(PRJDIR) $(UCSIM_LIBS) $(LIBS)
+	$(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