moved tech config to act/ directory

Author: rmanohar

act/Makefile

@@ -23,7 +23,8 @@ LIB=libact_$(EXT).a
 TARGETLIBS=$(LIB)
 
 TARGETINCS=lang.h expr.h act_parse_id.h path.h namespaces.h act.h \
-	types.h inst.h iter.h act_array.h basetype.h body.h value.h
+	types.h inst.h iter.h act_array.h basetype.h body.h value.h \
+	tech.h
 
 TARGETINCSUBDIR=act
 
@@ -32,7 +33,7 @@ TARGETCONF=global.conf
 OBJS1=expr.o path.o
 OBJS2=namespaces.o act_parse.o act_walk_X.o wrap.o act.o prs.o types.o \
 	body.o check.o error.o array.o expr2.o id.o lang.o iter.o \
-	mangle.o inst.o scope.o connect.o pass.o
+	mangle.o inst.o scope.o connect.o pass.o tech.o
 
 OBJS=$(OBJS1) $(OBJS2)
 

common/tech.cc renamed to act/tech.cc

@@ -26,6 +26,8 @@
 #include <config.h>
 #include <misc.h>
 #include <array.h>
+#include <act/lang.h>
+#include <act/passes/netlist.h>
 #include "tech.h"
 
 #define BUF_SZ 10240
@@ -65,11 +67,8 @@ static void verify_range_table (const char *nm)
   }
 }
 
-//#define PTYPE EDGE_PFET
-//#define NTYPE EDGE_NFET
-#define PTYPE 1
-#define NTYPE 0
-extern const char *act_dev_value_to_string (int);
+#define PTYPE EDGE_PFET
+#define NTYPE EDGE_NFET
 
 /*------------------------------------------------------------------------
  *

common/tech.h renamed to act/tech.h

@@ -13,7 +13,6 @@ else
 fi
 
 echo "Building common library/generators..." && \
-   make -C common install_inc && \
    make -C common install && \
    make -C pgen install
 

build

@@ -30,7 +30,7 @@ TARGETINCS=array.h bitset.h misc.h hash.h qops.h config.h atrace.h \
 	names.h mstring.h mytime.h \
 	channel.h hconfig.h contexts.h count.h \
 	machine.h mem.h mutex.h  thread.h sim.h \
-	log.h ext.h simthread.h simdes.h tech.h
+	log.h ext.h simthread.h simdes.h
 
 # general library support
 OBJS1=bitset.o misc.o hash.o config.o atrace.o avl.o lzw.o lex.o file.o \
@@ -49,7 +49,7 @@ OBJS3=$(OBJS3C) $(OBJS3C2) $(OBJS3CPP) $(OBJS3CPP2)
 
 OBJS4=$(OBJS4C) $(OBJS4C2) $(OBJS4CPP) $(OBJS4CPP2)
 
-SRCS=$(OBJS1:.o=.c) tech.cc $(OBJS3C:.o=.c) $(OBJS3CPP:.o=.cc) \
+SRCS=$(OBJS1:.o=.c) $(OBJS3C:.o=.c) $(OBJS3CPP:.o=.cc) \
 	$(OBJS4C:.o=.c) $(OBJS4CPP:.o=.cc) # ns.c
 
 OBJS=$(OBJS1) $(OBJS3) $(OBJS4) $(OBJS2)
@@ -116,8 +116,8 @@ alog.o: log.cc
 #queue.o: queue.cc
 #	$(CXX) -c $(CFLAGS) $(DFLAGS) -DSYNCHRONOUS $<
 
-$(LIB1): $(OBJS1) tech.o
-	ar ruv $(LIB1) $(OBJS1) tech.o
+$(LIB1): $(OBJS1) 
+	ar ruv $(LIB1) $(OBJS1)
 	$(RANLIB) $(LIB1)
 
 $(LIB3): $(OBJS3)