From 1c33107cbb50705272682c2637d8faaeab4be61a Mon Sep 17 00:00:00 2001 From: Alan Mishchenko Date: Sat, 7 Jul 2012 20:14:12 -0700 Subject: Updating project settings to have simpler include paths. --- Makefile | 2 +- abcexe.dsp | 4 +-- abclib.dsp | 4 +-- src/aig/aig/aig.h | 4 +-- src/aig/aig/aigCanon.c | 6 ++-- src/aig/aig/aigCuts.c | 2 +- src/aig/aig/aigDfs.c | 2 +- src/aig/aig/aigDoms.c | 2 +- src/aig/aig/aigDup.c | 4 +-- src/aig/aig/aigFact.c | 2 +- src/aig/aig/aigInter.c | 4 +-- src/aig/aig/aigMan.c | 2 +- src/aig/aig/aigPart.c | 4 +-- src/aig/aig/aigPartSat.c | 4 +-- src/aig/aig/aigRepar.c | 4 +-- src/aig/aig/aigSplit.c | 4 +-- src/aig/aig/aigTsim.c | 2 +- src/aig/aig/aigUtil.c | 4 +-- src/aig/gia/gia.h | 4 +-- src/aig/gia/giaAbs.c | 2 +- src/aig/gia/giaAbsGla.c | 8 ++--- src/aig/gia/giaAbsVta.c | 4 +-- src/aig/gia/giaAig.c | 6 ++-- src/aig/gia/giaAig.h | 2 +- src/aig/gia/giaBidec.c | 2 +- src/aig/gia/giaCCof.c | 2 +- src/aig/gia/giaEmbed.c | 2 +- src/aig/gia/giaEquiv.c | 8 ++--- src/aig/gia/giaEra.c | 2 +- src/aig/gia/giaEra2.c | 4 +-- src/aig/gia/giaGiarf.c | 2 +- src/aig/gia/giaHcd.c | 4 +-- src/aig/gia/giaIf.c | 6 ++-- src/aig/gia/giaMan.c | 2 +- src/aig/gia/giaReparam.c | 2 +- src/aig/gia/giaShrink.c | 4 +-- src/aig/gia/giaSpeedup.c | 2 +- src/aig/gia/giaSupMin.c | 2 +- src/aig/gia/giaSwitch.c | 2 +- src/aig/hop/hop.h | 2 +- src/aig/ioa/ioa.h | 4 +-- src/aig/ivy/ivy.h | 4 +-- src/aig/ivy/ivyFraig.c | 8 ++--- src/aig/ivy/ivyRwr.c | 4 +-- src/aig/ivy/ivySeq.c | 4 +-- src/aig/saig/saig.h | 4 +-- src/aig/saig/saigAbsCba.c | 4 +-- src/aig/saig/saigAbsPba.c | 6 ++-- src/aig/saig/saigAbsStart.c | 8 ++--- src/aig/saig/saigAbsVfa.c | 4 +-- src/aig/saig/saigBmc.c | 8 ++--- src/aig/saig/saigBmc2.c | 6 ++-- src/aig/saig/saigBmc3.c | 6 ++-- src/aig/saig/saigCexMin.c | 2 +- src/aig/saig/saigConstr.c | 8 ++--- src/aig/saig/saigConstr2.c | 8 ++--- src/aig/saig/saigGlaCba.c | 4 +-- src/aig/saig/saigGlaPba.c | 4 +-- src/aig/saig/saigGlaPba2.c | 2 +- src/aig/saig/saigHaig.c | 4 +-- src/aig/saig/saigInd.c | 4 +-- src/aig/saig/saigIso.c | 4 +-- src/aig/saig/saigMiter.c | 2 +- src/aig/saig/saigOutDec.c | 4 +-- src/aig/saig/saigRefSat.c | 4 +-- src/aig/saig/saigRetMin.c | 8 ++--- src/aig/saig/saigSimExt.c | 2 +- src/aig/saig/saigSimExt2.c | 2 +- src/aig/saig/saigSimFast.c | 2 +- src/aig/saig/saigSimSeq.c | 2 +- src/aig/saig/saigStrSim.c | 2 +- src/aig/saig/saigSwitch.c | 2 +- src/aig/saig/saigTrans.c | 2 +- src/base/abc/abc.h | 16 +++++----- src/base/abc/abcBlifMv.c | 2 +- src/base/abc/abcCheck.c | 4 +-- src/base/abc/abcFunc.c | 6 ++-- src/base/abc/abcHieCec.c | 4 +-- src/base/abc/abcHieNew.c | 8 ++--- src/base/abc/abcLatch.c | 4 +-- src/base/abc/abcMinBase.c | 2 +- src/base/abc/abcNetlist.c | 2 +- src/base/abc/abcNtk.c | 8 ++--- src/base/abc/abcObj.c | 6 ++-- src/base/abc/abcShow.c | 6 ++-- src/base/abc/abcUtil.c | 8 ++--- src/base/abci/abc.c | 62 +++++++++++++++++++------------------- src/base/abci/abcAttach.c | 6 ++-- src/base/abci/abcAuto.c | 4 +-- src/base/abci/abcBalance.c | 2 +- src/base/abci/abcBidec.c | 6 ++-- src/base/abci/abcBm.c | 8 ++--- src/base/abci/abcBmc.c | 4 +-- src/base/abci/abcCas.c | 4 +-- src/base/abci/abcCascade.c | 6 ++-- src/base/abci/abcCollapse.c | 4 +-- src/base/abci/abcCut.c | 4 +-- src/base/abci/abcDar.c | 38 +++++++++++------------ src/base/abci/abcDebug.c | 4 +-- src/base/abci/abcDress.c | 4 +-- src/base/abci/abcDress2.c | 6 ++-- src/base/abci/abcDsd.c | 6 ++-- src/base/abci/abcExtract.c | 2 +- src/base/abci/abcFpga.c | 6 ++-- src/base/abci/abcFpgaFast.c | 4 +-- src/base/abci/abcFraig.c | 6 ++-- src/base/abci/abcFxu.c | 4 +-- src/base/abci/abcGen.c | 4 +-- src/base/abci/abcHaig.c | 2 +- src/base/abci/abcIf.c | 10 +++--- src/base/abci/abcIfMux.c | 4 +-- src/base/abci/abcIfif.c | 4 +-- src/base/abci/abcIvy.c | 16 +++++----- src/base/abci/abcLog.c | 4 +-- src/base/abci/abcLut.c | 4 +-- src/base/abci/abcLutmin.c | 4 +-- src/base/abci/abcMap.c | 8 ++--- src/base/abci/abcMeasure.c | 4 +-- src/base/abci/abcMerge.c | 6 ++-- src/base/abci/abcMffc.c | 2 +- src/base/abci/abcMini.c | 2 +- src/base/abci/abcMiter.c | 2 +- src/base/abci/abcMulti.c | 4 +-- src/base/abci/abcMv.c | 4 +-- src/base/abci/abcNpnSave.c | 4 +-- src/base/abci/abcNtbdd.c | 4 +-- src/base/abci/abcOdc.c | 2 +- src/base/abci/abcOrder.c | 2 +- src/base/abci/abcPart.c | 6 ++-- src/base/abci/abcPrint.c | 14 ++++----- src/base/abci/abcProve.c | 6 ++-- src/base/abci/abcQbf.c | 2 +- src/base/abci/abcQuant.c | 2 +- src/base/abci/abcReach.c | 4 +-- src/base/abci/abcRec.c | 6 ++-- src/base/abci/abcReconv.c | 4 +-- src/base/abci/abcRefactor.c | 6 ++-- src/base/abci/abcRenode.c | 10 +++--- src/base/abci/abcReorder.c | 4 +-- src/base/abci/abcRestruct.c | 10 +++--- src/base/abci/abcResub.c | 4 +-- src/base/abci/abcRewrite.c | 6 ++-- src/base/abci/abcRr.c | 6 ++-- src/base/abci/abcSat.c | 10 +++--- src/base/abci/abcScorr.c | 14 ++++----- src/base/abci/abcSense.c | 4 +-- src/base/abci/abcSpeedup.c | 8 ++--- src/base/abci/abcStrash.c | 4 +-- src/base/abci/abcSweep.c | 8 ++--- src/base/abci/abcSymm.c | 6 ++-- src/base/abci/abcTiming.c | 6 ++-- src/base/abci/abcUnate.c | 4 +-- src/base/abci/abcUnreach.c | 4 +-- src/base/abci/abcVerify.c | 18 +++++------ src/base/abci/abcXsim.c | 4 +-- src/base/cmd/cmd.c | 6 ++-- src/base/cmd/cmdAlias.c | 2 +- src/base/cmd/cmdApi.c | 4 +-- src/base/cmd/cmdFlag.c | 4 +-- src/base/cmd/cmdHist.c | 4 +-- src/base/cmd/cmdInt.h | 2 +- src/base/cmd/cmdLoad.c | 6 ++-- src/base/cmd/cmdPlugin.c | 6 ++-- src/base/cmd/cmdUtils.c | 4 +-- src/base/io/io.c | 6 ++-- src/base/io/ioAbc.h | 4 +-- src/base/io/ioReadAiger.c | 4 +-- src/base/io/ioReadBblif.c | 4 +-- src/base/io/ioReadBlif.c | 4 +-- src/base/io/ioReadBlifAig.c | 4 +-- src/base/io/ioReadBlifMv.c | 8 ++--- src/base/io/ioReadVerilog.c | 2 +- src/base/io/ioUtil.c | 2 +- src/base/io/ioWriteAiger.c | 8 ++--- src/base/io/ioWriteBblif.c | 2 +- src/base/io/ioWriteBlif.c | 8 ++--- src/base/io/ioWriteBlifMv.c | 4 +-- src/base/io/ioWriteBook.c | 4 +-- src/base/io/ioWriteCnf.c | 2 +- src/base/io/ioWriteDot.c | 4 +-- src/base/io/ioWriteVerilog.c | 4 +-- src/base/main/libSupport.c | 2 +- src/base/main/main.c | 2 +- src/base/main/main.h | 12 ++++---- src/base/main/mainFrame.c | 6 ++-- src/base/main/mainInit.c | 2 +- src/base/main/mainInt.h | 20 ++++++------ src/base/main/mainLib.c | 2 +- src/base/main/mainUtils.c | 2 +- src/base/test/test.c | 2 +- src/base/ver/ver.h | 2 +- src/base/ver/verCore.c | 4 +-- src/bdd/cas/casCore.c | 6 ++-- src/bdd/cas/casDec.c | 2 +- src/bdd/cudd/cudd.h | 4 +-- src/bdd/cudd/cuddAPI.c | 2 +- src/bdd/cudd/cuddAddAbs.c | 2 +- src/bdd/cudd/cuddAddApply.c | 2 +- src/bdd/cudd/cuddAddFind.c | 2 +- src/bdd/cudd/cuddAddInv.c | 2 +- src/bdd/cudd/cuddAddIte.c | 2 +- src/bdd/cudd/cuddAddNeg.c | 2 +- src/bdd/cudd/cuddAddWalsh.c | 2 +- src/bdd/cudd/cuddAndAbs.c | 2 +- src/bdd/cudd/cuddAnneal.c | 2 +- src/bdd/cudd/cuddApa.c | 2 +- src/bdd/cudd/cuddApprox.c | 2 +- src/bdd/cudd/cuddBddAbs.c | 2 +- src/bdd/cudd/cuddBddCorr.c | 2 +- src/bdd/cudd/cuddBddIte.c | 2 +- src/bdd/cudd/cuddBridge.c | 2 +- src/bdd/cudd/cuddCache.c | 2 +- src/bdd/cudd/cuddCheck.c | 2 +- src/bdd/cudd/cuddClip.c | 2 +- src/bdd/cudd/cuddCof.c | 2 +- src/bdd/cudd/cuddCompose.c | 2 +- src/bdd/cudd/cuddDecomp.c | 2 +- src/bdd/cudd/cuddEssent.c | 2 +- src/bdd/cudd/cuddExact.c | 2 +- src/bdd/cudd/cuddExport.c | 2 +- src/bdd/cudd/cuddGenCof.c | 2 +- src/bdd/cudd/cuddGenetic.c | 2 +- src/bdd/cudd/cuddGroup.c | 2 +- src/bdd/cudd/cuddHarwell.c | 2 +- src/bdd/cudd/cuddInit.c | 2 +- src/bdd/cudd/cuddInt.h | 6 ++-- src/bdd/cudd/cuddInteract.c | 2 +- src/bdd/cudd/cuddLCache.c | 2 +- src/bdd/cudd/cuddLevelQ.c | 2 +- src/bdd/cudd/cuddLinear.c | 2 +- src/bdd/cudd/cuddLiteral.c | 2 +- src/bdd/cudd/cuddMatMult.c | 2 +- src/bdd/cudd/cuddPriority.c | 2 +- src/bdd/cudd/cuddRead.c | 2 +- src/bdd/cudd/cuddRef.c | 2 +- src/bdd/cudd/cuddReorder.c | 2 +- src/bdd/cudd/cuddSat.c | 2 +- src/bdd/cudd/cuddSign.c | 2 +- src/bdd/cudd/cuddSolve.c | 2 +- src/bdd/cudd/cuddSplit.c | 2 +- src/bdd/cudd/cuddSubsetHB.c | 2 +- src/bdd/cudd/cuddSubsetSP.c | 2 +- src/bdd/cudd/cuddSymmetry.c | 2 +- src/bdd/cudd/cuddTable.c | 2 +- src/bdd/cudd/cuddUtil.c | 2 +- src/bdd/cudd/cuddWindow.c | 2 +- src/bdd/cudd/cuddZddCount.c | 2 +- src/bdd/cudd/cuddZddFuncs.c | 2 +- src/bdd/cudd/cuddZddGroup.c | 2 +- src/bdd/cudd/cuddZddIsop.c | 2 +- src/bdd/cudd/cuddZddLin.c | 2 +- src/bdd/cudd/cuddZddMisc.c | 2 +- src/bdd/cudd/cuddZddPort.c | 2 +- src/bdd/cudd/cuddZddReord.c | 2 +- src/bdd/cudd/cuddZddSetop.c | 2 +- src/bdd/cudd/cuddZddSymm.c | 2 +- src/bdd/cudd/cuddZddUtil.c | 2 +- src/bdd/dsd/dsdInt.h | 2 +- src/bdd/epd/epd.c | 2 +- src/bdd/mtr/mtrBasic.c | 2 +- src/bdd/mtr/mtrGroup.c | 2 +- src/bdd/parse/parseEqn.c | 4 +-- src/bdd/parse/parseInt.h | 2 +- src/bdd/reo/reo.h | 2 +- src/bool/bdc/bdcInt.h | 2 +- src/bool/bdc/bdcSpfd.c | 2 +- src/bool/dec/decAbc.c | 4 +-- src/bool/dec/decFactor.c | 8 ++--- src/bool/dec/decMan.c | 4 +-- src/bool/dec/decPrint.c | 2 +- src/bool/dec/decUtil.c | 4 +-- src/bool/kit/cloud.h | 2 +- src/bool/kit/kit.h | 4 +-- src/bool/kit/kitAig.c | 2 +- src/bool/kit/kitBdd.c | 2 +- src/bool/kit/kitHop.c | 2 +- src/bool/kit/kitPla.c | 2 +- src/map/amap/amapCore.c | 2 +- src/map/amap/amapInt.h | 2 +- src/map/amap/amapParse.c | 4 +-- src/map/amap/amapPerm.c | 2 +- src/map/amap/amapRead.c | 2 +- src/map/amap/amapRule.c | 2 +- src/map/cov/cov.h | 2 +- src/map/cov/covInt.h | 2 +- src/map/fpga/fpga.c | 2 +- src/map/fpga/fpgaCreate.c | 2 +- src/map/fpga/fpgaInt.h | 2 +- src/map/fpga/fpgaTruth.c | 2 +- src/map/if/if.h | 6 ++-- src/map/if/ifDec07.c | 4 +-- src/map/if/ifDec08.c | 4 +-- src/map/if/ifDec10.c | 4 +-- src/map/if/ifDec16.c | 2 +- src/map/if/ifTime.c | 2 +- src/map/mapper/mapper.c | 6 ++-- src/map/mapper/mapperInt.h | 6 ++-- src/map/mio/mio.c | 6 ++-- src/map/mio/mioInt.h | 6 ++-- src/map/mio/mioRead.c | 2 +- src/map/mio/mioUtils.c | 2 +- src/map/super/super.c | 4 +-- src/map/super/superInt.h | 10 +++--- src/misc/bar/bar.c | 4 +-- src/misc/bbl/bblif.c | 2 +- src/misc/bzlib/bzlib.h | 2 +- src/misc/extra/extra.h | 2 +- src/misc/extra/extraBdd.h | 6 ++-- src/misc/extra/extraUtilProgress.c | 2 +- src/misc/extra/extraUtilReader.c | 2 +- src/misc/hash/hash.h | 2 +- src/misc/hash/hashFlt.h | 2 +- src/misc/hash/hashInt.h | 2 +- src/misc/hash/hashPtr.h | 2 +- src/misc/mem/mem.h | 2 +- src/misc/mvc/mvc.h | 2 +- src/misc/nm/nmInt.h | 4 +-- src/misc/st/st.h | 2 +- src/misc/st/stmm.c | 2 +- src/misc/st/stmm.h | 2 +- src/misc/tim/tim.c | 4 +-- src/misc/util/utilBridge.c | 2 +- src/misc/util/utilNam.c | 2 +- src/misc/vec/vec.h | 2 +- src/misc/zlib/adler32.c | 2 +- src/misc/zlib/crc32.c | 2 +- src/misc/zlib/deflate.c | 2 +- src/misc/zlib/gzclose.c | 2 +- src/misc/zlib/gzguts.h | 2 +- src/misc/zlib/gzlib.c | 2 +- src/misc/zlib/gzread.c | 2 +- src/misc/zlib/gzwrite.c | 2 +- src/misc/zlib/infback.c | 2 +- src/misc/zlib/inffast.c | 2 +- src/misc/zlib/inflate.c | 2 +- src/misc/zlib/inftrees.c | 2 +- src/misc/zlib/trees.c | 2 +- src/misc/zlib/uncompr.c | 2 +- src/misc/zlib/zlib.h | 2 +- src/misc/zlib/zutil.c | 2 +- src/opt/cgt/cgtCore.c | 2 +- src/opt/cgt/cgtDecide.c | 2 +- src/opt/cgt/cgtInt.h | 6 ++-- src/opt/csw/cswInt.h | 6 ++-- src/opt/cut/cutInt.h | 4 +-- src/opt/dar/darBalance.c | 2 +- src/opt/dar/darData.c | 2 +- src/opt/dar/darInt.h | 4 +-- src/opt/dar/darLib.c | 2 +- src/opt/dar/darMan.c | 2 +- src/opt/dar/darRefact.c | 6 ++-- src/opt/dar/darScript.c | 6 ++-- src/opt/fxu/fxu.h | 2 +- src/opt/fxu/fxuInt.h | 2 +- src/opt/fxu/fxuReduce.c | 2 +- src/opt/fxu/fxuSingle.c | 2 +- src/opt/lpk/lpkCore.c | 4 +-- src/opt/lpk/lpkCut.c | 2 +- src/opt/lpk/lpkInt.h | 6 ++-- src/opt/mfs/mfsInt.h | 14 ++++----- src/opt/mfs/mfsInter.c | 2 +- src/opt/mfs/mfsStrash.c | 2 +- src/opt/nwk/nwk.h | 16 +++++----- src/opt/nwk/nwkAig.c | 2 +- src/opt/nwk/nwkMap.c | 2 +- src/opt/nwk/nwkUtil.c | 2 +- src/opt/res/resCore.c | 6 ++-- src/opt/res/resDivs.c | 2 +- src/opt/res/resFilter.c | 2 +- src/opt/res/resSat.c | 6 ++-- src/opt/res/resSim.c | 2 +- src/opt/res/resStrash.c | 2 +- src/opt/res/resWin.c | 2 +- src/opt/ret/retInt.h | 2 +- src/opt/rwr/rwr.h | 4 +-- src/opt/rwr/rwrDec.c | 2 +- src/opt/rwr/rwrEva.c | 4 +-- src/opt/rwr/rwrMan.c | 4 +-- src/opt/rwt/rwt.h | 6 ++-- src/opt/rwt/rwtDec.c | 2 +- src/opt/rwt/rwtMan.c | 2 +- src/opt/sim/simMan.c | 2 +- src/opt/sim/simSat.c | 2 +- src/opt/sim/simSeq.c | 2 +- src/opt/sim/simSupp.c | 4 +-- src/opt/sim/simSwitch.c | 2 +- src/opt/sim/simSym.c | 2 +- src/opt/sim/simSymSat.c | 4 +-- src/opt/sim/simSymSim.c | 2 +- src/opt/sim/simSymStr.c | 2 +- src/opt/sim/simUtils.c | 2 +- src/proof/bbr/bbr.h | 6 ++-- src/proof/bbr/bbrImage.c | 2 +- src/proof/cec/cecCec.c | 4 +-- src/proof/cec/cecChoice.c | 4 +-- src/proof/cec/cecInt.h | 6 ++-- src/proof/cec/cecSynth.c | 2 +- src/proof/dch/dchInt.h | 4 +-- src/proof/dch/dchSweep.c | 2 +- src/proof/fra/fra.h | 10 +++--- src/proof/fra/fraCec.c | 4 +-- src/proof/fra/fraClau.c | 4 +-- src/proof/fra/fraClaus.c | 4 +-- src/proof/fra/fraInd.c | 6 ++-- src/proof/fra/fraIndVer.c | 2 +- src/proof/fra/fraSec.c | 12 ++++---- src/proof/fra/fraSim.c | 2 +- src/proof/fraig/fraigInt.h | 4 +-- src/proof/fraig/fraigSat.c | 2 +- src/proof/int/intContain.c | 4 +-- src/proof/int/intCtrex.c | 2 +- src/proof/int/intInt.h | 8 ++--- src/proof/int/intM114p.c | 2 +- src/proof/int/intMan.c | 2 +- src/proof/live/liveness.c | 8 ++--- src/proof/live/liveness_sim.c | 6 ++-- src/proof/live/ltl_parser.c | 6 ++-- src/proof/llb/llb1Core.c | 4 +-- src/proof/llb/llb4Cex.c | 4 +-- src/proof/llb/llb4Map.c | 4 +-- src/proof/llb/llbInt.h | 8 ++--- src/proof/pdr/pdrInt.h | 6 ++-- src/proof/pdr/pdrInv.c | 4 +-- src/proof/ssw/sswConstr.c | 4 +-- src/proof/ssw/sswDyn.c | 2 +- src/proof/ssw/sswFilter.c | 2 +- src/proof/ssw/sswInt.h | 6 ++-- src/proof/ssw/sswPart.c | 2 +- src/proof/ssw/sswRarity.c | 4 +-- src/proof/ssw/sswRarity2.c | 2 +- src/proof/ssw/sswSweep.c | 2 +- src/sat/bsat/satInterA.c | 2 +- src/sat/bsat/satInterB.c | 2 +- src/sat/bsat/satInterP.c | 2 +- src/sat/bsat/satMem.h | 2 +- src/sat/bsat/satProof.c | 6 ++-- src/sat/bsat/satSolver.h | 2 +- src/sat/bsat/satSolver2.h | 2 +- src/sat/bsat/satTruth.c | 2 +- src/sat/bsat/satTruth.h | 2 +- src/sat/bsat/satVec.h | 2 +- src/sat/cnf/cnf.h | 6 ++-- src/sat/cnf/cnfCut.c | 2 +- src/sat/cnf/cnfFast.c | 2 +- src/sat/cnf/cnfMan.c | 6 ++-- src/sat/csat/csat_apis.c | 8 ++--- src/sat/msat/msatInt.h | 2 +- src/sat/proof/pr.c | 2 +- 448 files changed, 878 insertions(+), 878 deletions(-) diff --git a/Makefile b/Makefile index 2398c578..e624cfec 100644 --- a/Makefile +++ b/Makefile @@ -35,7 +35,7 @@ arch_flags : arch_flags.c ARCHFLAGS := $(shell $(CC) arch_flags.c -o arch_flags && ./arch_flags) OPTFLAGS := -g -O #-DABC_NAMESPACE=xxx -CFLAGS += -Wall -Wno-unused-function $(OPTFLAGS) $(ARCHFLAGS) -I$(PWD) +CFLAGS += -Wall -Wno-unused-function $(OPTFLAGS) $(ARCHFLAGS) -I$(PWD)/src CXXFLAGS += $(CFLAGS) #LIBS := -m32 -ldl -rdynamic -lreadline -ltermcap diff --git a/abcexe.dsp b/abcexe.dsp index 5646b6e4..df1c4459 100644 --- a/abcexe.dsp +++ b/abcexe.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "C:/_projects/abc" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D ABC_DLL=ABC_DLLEXPORT /D "_CRT_SECURE_NO_DEPRECATE" /FR /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D ABC_DLL=ABC_DLLEXPORT /D "_CRT_SECURE_NO_DEPRECATE" /FR /YX /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -66,7 +66,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "C:/_projects/abc" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D ABC_DLL=ABC_DLLEXPORT /D "_CRT_SECURE_NO_DEPRECATE" /FR /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D ABC_DLL=ABC_DLLEXPORT /D "_CRT_SECURE_NO_DEPRECATE" /FR /YX /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe diff --git a/abclib.dsp b/abclib.dsp index 71c3e22b..2813c2c9 100644 --- a/abclib.dsp +++ b/abclib.dsp @@ -41,7 +41,7 @@ RSC=rc.exe # PROP Intermediate_Dir "ReleaseLib" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "C:/_projects/abc" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D ABC_DLL=ABC_DLLEXPORT /D "_CRT_SECURE_NO_DEPRECATE" /FR /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D ABC_DLL=ABC_DLLEXPORT /D "_CRT_SECURE_NO_DEPRECATE" /FR /YX /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -64,7 +64,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "DebugLib" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "C:/_projects/abc" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D ABC_DLL=ABC_DLLEXPORT /D "_CRT_SECURE_NO_DEPRECATE" /FR /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D ABC_DLL=ABC_DLLEXPORT /D "_CRT_SECURE_NO_DEPRECATE" /FR /YX /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe diff --git a/src/aig/aig/aig.h b/src/aig/aig/aig.h index adad1837..3e682391 100644 --- a/src/aig/aig/aig.h +++ b/src/aig/aig/aig.h @@ -31,8 +31,8 @@ #include #include -#include "src/misc/vec/vec.h" -#include "src/misc/util/utilCex.h" +#include "misc/vec/vec.h" +#include "misc/util/utilCex.h" //////////////////////////////////////////////////////////////////////// /// PARAMETERS /// diff --git a/src/aig/aig/aigCanon.c b/src/aig/aig/aigCanon.c index f312c996..e13e88fd 100644 --- a/src/aig/aig/aigCanon.c +++ b/src/aig/aig/aigCanon.c @@ -19,9 +19,9 @@ ***********************************************************************/ #include "aig.h" -#include "src/bool/kit/kit.h" -#include "src/bool/bdc/bdc.h" -#include "src/aig/ioa/ioa.h" +#include "bool/kit/kit.h" +#include "bool/bdc/bdc.h" +#include "aig/ioa/ioa.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/aig/aigCuts.c b/src/aig/aig/aigCuts.c index 5e3bb93a..da20c4d9 100644 --- a/src/aig/aig/aigCuts.c +++ b/src/aig/aig/aigCuts.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "aig.h" -#include "src/bool/kit/kit.h" +#include "bool/kit/kit.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/aig/aigDfs.c b/src/aig/aig/aigDfs.c index b4b7862e..c55cbedd 100644 --- a/src/aig/aig/aigDfs.c +++ b/src/aig/aig/aigDfs.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "aig.h" -#include "src/misc/tim/tim.h" +#include "misc/tim/tim.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/aig/aigDoms.c b/src/aig/aig/aigDoms.c index fe9403b5..a537e2ab 100644 --- a/src/aig/aig/aigDoms.c +++ b/src/aig/aig/aigDoms.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "aig.h" -#include "src/aig/saig/saig.h" +#include "aig/saig/saig.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/aig/aigDup.c b/src/aig/aig/aigDup.c index 97d99128..b4c61d15 100644 --- a/src/aig/aig/aigDup.c +++ b/src/aig/aig/aigDup.c @@ -18,8 +18,8 @@ ***********************************************************************/ -#include "src/aig/saig/saig.h" -#include "src/misc/tim/tim.h" +#include "aig/saig/saig.h" +#include "misc/tim/tim.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/aig/aigFact.c b/src/aig/aig/aigFact.c index 33e07161..196cea71 100644 --- a/src/aig/aig/aigFact.c +++ b/src/aig/aig/aigFact.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "aig.h" -#include "src/bool/kit/kit.h" +#include "bool/kit/kit.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/aig/aigInter.c b/src/aig/aig/aigInter.c index f4901c79..636cb494 100644 --- a/src/aig/aig/aigInter.c +++ b/src/aig/aig/aigInter.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "aig.h" -#include "src/sat/cnf/cnf.h" -#include "src/sat/bsat/satStore.h" +#include "sat/cnf/cnf.h" +#include "sat/bsat/satStore.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/aig/aigMan.c b/src/aig/aig/aigMan.c index a7bd17da..6a0555a0 100644 --- a/src/aig/aig/aigMan.c +++ b/src/aig/aig/aigMan.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "aig.h" -#include "src/misc/tim/tim.h" +#include "misc/tim/tim.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/aig/aigPart.c b/src/aig/aig/aigPart.c index fdbba36a..4ca12041 100644 --- a/src/aig/aig/aigPart.c +++ b/src/aig/aig/aigPart.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "aig.h" -#include "src/misc/tim/tim.h" -#include "src/proof/fra/fra.h" +#include "misc/tim/tim.h" +#include "proof/fra/fra.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/aig/aigPartSat.c b/src/aig/aig/aigPartSat.c index d187a19b..ec6a6d73 100644 --- a/src/aig/aig/aigPartSat.c +++ b/src/aig/aig/aigPartSat.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "aig.h" -#include "src/sat/bsat/satSolver.h" -#include "src/sat/cnf/cnf.h" +#include "sat/bsat/satSolver.h" +#include "sat/cnf/cnf.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/aig/aigRepar.c b/src/aig/aig/aigRepar.c index 7f9699fd..210c527e 100644 --- a/src/aig/aig/aigRepar.c +++ b/src/aig/aig/aigRepar.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "aig.h" -#include "src/sat/cnf/cnf.h" -#include "src/sat/bsat/satSolver2.h" +#include "sat/cnf/cnf.h" +#include "sat/bsat/satSolver2.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/aig/aigSplit.c b/src/aig/aig/aigSplit.c index 50f96a81..5c6b833c 100644 --- a/src/aig/aig/aigSplit.c +++ b/src/aig/aig/aigSplit.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "aig.h" -#include "src/aig/saig/saig.h" -#include "src/misc/extra/extraBdd.h" +#include "aig/saig/saig.h" +#include "misc/extra/extraBdd.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/aig/aigTsim.c b/src/aig/aig/aigTsim.c index 36dc28dd..dd9eb6e7 100644 --- a/src/aig/aig/aigTsim.c +++ b/src/aig/aig/aigTsim.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "aig.h" -#include "src/aig/saig/saig.h" +#include "aig/saig/saig.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/aig/aigUtil.c b/src/aig/aig/aigUtil.c index 0cf12370..4d1a8912 100644 --- a/src/aig/aig/aigUtil.c +++ b/src/aig/aig/aigUtil.c @@ -1288,8 +1288,8 @@ void Aig_NodeIntersectLists( Vec_Ptr_t * vArr1, Vec_Ptr_t * vArr2, Vec_Ptr_t * v ABC_NAMESPACE_IMPL_END -#include "src/proof/fra/fra.h" -#include "src/aig/saig/saig.h" +#include "proof/fra/fra.h" +#include "aig/saig/saig.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/gia/gia.h b/src/aig/gia/gia.h index 0d97dd61..f427b670 100644 --- a/src/aig/gia/gia.h +++ b/src/aig/gia/gia.h @@ -31,8 +31,8 @@ #include #include -#include "src/misc/vec/vec.h" -#include "src/misc/util/utilCex.h" +#include "misc/vec/vec.h" +#include "misc/util/utilCex.h" #include "giaAbs.h" //////////////////////////////////////////////////////////////////////// diff --git a/src/aig/gia/giaAbs.c b/src/aig/gia/giaAbs.c index 548eec74..9e37c5ed 100644 --- a/src/aig/gia/giaAbs.c +++ b/src/aig/gia/giaAbs.c @@ -20,7 +20,7 @@ #include "gia.h" #include "giaAig.h" -#include "src/aig/saig/saig.h" +#include "aig/saig/saig.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/gia/giaAbsGla.c b/src/aig/gia/giaAbsGla.c index 0cd0b300..9576ea38 100644 --- a/src/aig/gia/giaAbsGla.c +++ b/src/aig/gia/giaAbsGla.c @@ -20,10 +20,10 @@ #include "gia.h" #include "giaAig.h" -#include "src/sat/cnf/cnf.h" -#include "src/sat/bsat/satSolver2.h" -#include "src/base/main/main.h" -#include "src/aig/saig/saig.h" +#include "sat/cnf/cnf.h" +#include "sat/bsat/satSolver2.h" +#include "base/main/main.h" +#include "aig/saig/saig.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/gia/giaAbsVta.c b/src/aig/gia/giaAbsVta.c index 59bcbb32..50692670 100644 --- a/src/aig/gia/giaAbsVta.c +++ b/src/aig/gia/giaAbsVta.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "gia.h" -#include "src/sat/bsat/satSolver2.h" -#include "src/base/main/main.h" +#include "sat/bsat/satSolver2.h" +#include "base/main/main.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/gia/giaAig.c b/src/aig/gia/giaAig.c index f8fce6f6..4099fe54 100644 --- a/src/aig/gia/giaAig.c +++ b/src/aig/gia/giaAig.c @@ -19,9 +19,9 @@ ***********************************************************************/ #include "giaAig.h" -#include "src/proof/fra/fra.h" -#include "src/proof/dch/dch.h" -#include "src/opt/dar/dar.h" +#include "proof/fra/fra.h" +#include "proof/dch/dch.h" +#include "opt/dar/dar.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/gia/giaAig.h b/src/aig/gia/giaAig.h index 6522a5bc..adcf9097 100644 --- a/src/aig/gia/giaAig.h +++ b/src/aig/gia/giaAig.h @@ -26,7 +26,7 @@ /// INCLUDES /// //////////////////////////////////////////////////////////////////////// -#include "src/aig/aig/aig.h" +#include "aig/aig/aig.h" #include "gia.h" ABC_NAMESPACE_HEADER_START diff --git a/src/aig/gia/giaBidec.c b/src/aig/gia/giaBidec.c index 19277f12..802c2bdc 100644 --- a/src/aig/gia/giaBidec.c +++ b/src/aig/gia/giaBidec.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "gia.h" -#include "src/bool/bdc/bdc.h" +#include "bool/bdc/bdc.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/gia/giaCCof.c b/src/aig/gia/giaCCof.c index ce863051..fd704635 100644 --- a/src/aig/gia/giaCCof.c +++ b/src/aig/gia/giaCCof.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "gia.h" -#include "src/sat/bsat/satSolver.h" +#include "sat/bsat/satSolver.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/gia/giaEmbed.c b/src/aig/gia/giaEmbed.c index 79a1acf4..871def74 100644 --- a/src/aig/gia/giaEmbed.c +++ b/src/aig/gia/giaEmbed.c @@ -20,7 +20,7 @@ #include #include "gia.h" -#include "src/aig/ioa/ioa.h" +#include "aig/ioa/ioa.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/gia/giaEquiv.c b/src/aig/gia/giaEquiv.c index 492f55ef..28e4901e 100644 --- a/src/aig/gia/giaEquiv.c +++ b/src/aig/gia/giaEquiv.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "gia.h" -#include "src/proof/cec/cec.h" +#include "proof/cec/cec.h" ABC_NAMESPACE_IMPL_START @@ -1654,9 +1654,9 @@ int Gia_ManCountChoices( Gia_Man_t * p ) ABC_NAMESPACE_IMPL_END -#include "src/aig/aig/aig.h" -#include "src/aig/saig/saig.h" -#include "src/proof/cec/cec.h" +#include "aig/aig/aig.h" +#include "aig/saig/saig.h" +#include "proof/cec/cec.h" #include "giaAig.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/gia/giaEra.c b/src/aig/gia/giaEra.c index 03832e4a..335a1299 100644 --- a/src/aig/gia/giaEra.c +++ b/src/aig/gia/giaEra.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "gia.h" -#include "src/misc/mem/mem.h" +#include "misc/mem/mem.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/gia/giaEra2.c b/src/aig/gia/giaEra2.c index f5f9fdb3..a05411fb 100644 --- a/src/aig/gia/giaEra2.c +++ b/src/aig/gia/giaEra2.c @@ -1772,8 +1772,8 @@ int Gia_ManArePerform( Gia_Man_t * pAig, int nStatesMax, int fMiter, int fVerbos ABC_NAMESPACE_IMPL_END #include "giaAig.h" -#include "src/sat/cnf/cnf.h" -#include "src/sat/bsat/satSolver.h" +#include "sat/cnf/cnf.h" +#include "sat/bsat/satSolver.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/gia/giaGiarf.c b/src/aig/gia/giaGiarf.c index 1e2d1d18..e472a48e 100644 --- a/src/aig/gia/giaGiarf.c +++ b/src/aig/gia/giaGiarf.c @@ -737,7 +737,7 @@ void Gia_GiarfPrintClasses( Gia_Man_t * pGia ) ABC_NAMESPACE_IMPL_END -#include "src/proof/cec/cecInt.h" +#include "proof/cec/cecInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/gia/giaHcd.c b/src/aig/gia/giaHcd.c index 656c880a..4e766c5b 100644 --- a/src/aig/gia/giaHcd.c +++ b/src/aig/gia/giaHcd.c @@ -20,8 +20,8 @@ #include "gia.h" #include "giaAig.h" -#include "src/aig/aig/aig.h" -#include "src/opt/dar/dar.h" +#include "aig/aig/aig.h" +#include "opt/dar/dar.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/gia/giaIf.c b/src/aig/gia/giaIf.c index 2ae7dab8..b4e4c565 100644 --- a/src/aig/gia/giaIf.c +++ b/src/aig/gia/giaIf.c @@ -19,9 +19,9 @@ ***********************************************************************/ #include "gia.h" -#include "src/aig/aig/aig.h" -#include "src/map/if/if.h" -#include "src/opt/dar/dar.h" +#include "aig/aig/aig.h" +#include "map/if/if.h" +#include "opt/dar/dar.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/gia/giaMan.c b/src/aig/gia/giaMan.c index d610882c..60337988 100644 --- a/src/aig/gia/giaMan.c +++ b/src/aig/gia/giaMan.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "gia.h" -#include "src/misc/tim/tim.h" +#include "misc/tim/tim.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/gia/giaReparam.c b/src/aig/gia/giaReparam.c index edaacdac..74f99df7 100644 --- a/src/aig/gia/giaReparam.c +++ b/src/aig/gia/giaReparam.c @@ -20,7 +20,7 @@ #include "gia.h" #include "giaAig.h" -#include "src/aig/saig/saig.h" +#include "aig/saig/saig.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/gia/giaShrink.c b/src/aig/gia/giaShrink.c index 2db815fc..3d8c9e50 100644 --- a/src/aig/gia/giaShrink.c +++ b/src/aig/gia/giaShrink.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "gia.h" -#include "src/aig/aig/aig.h" -#include "src/opt/dar/dar.h" +#include "aig/aig/aig.h" +#include "opt/dar/dar.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/gia/giaSpeedup.c b/src/aig/gia/giaSpeedup.c index 1098771e..be9a8654 100644 --- a/src/aig/gia/giaSpeedup.c +++ b/src/aig/gia/giaSpeedup.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "gia.h" -#include "src/map/if/if.h" +#include "map/if/if.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/gia/giaSupMin.c b/src/aig/gia/giaSupMin.c index 90c30c71..248587a0 100644 --- a/src/aig/gia/giaSupMin.c +++ b/src/aig/gia/giaSupMin.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "gia.h" -#include "src/bool/kit/kit.h" +#include "bool/kit/kit.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/gia/giaSwitch.c b/src/aig/gia/giaSwitch.c index d1440ae0..73dff345 100644 --- a/src/aig/gia/giaSwitch.c +++ b/src/aig/gia/giaSwitch.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "giaAig.h" -#include "src/base/main/main.h" +#include "base/main/main.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/hop/hop.h b/src/aig/hop/hop.h index d23f3508..2d25b002 100644 --- a/src/aig/hop/hop.h +++ b/src/aig/hop/hop.h @@ -31,7 +31,7 @@ #include #include -#include "src/misc/vec/vec.h" +#include "misc/vec/vec.h" //////////////////////////////////////////////////////////////////////// /// PARAMETERS /// diff --git a/src/aig/ioa/ioa.h b/src/aig/ioa/ioa.h index 809e8e3f..c8aebd39 100644 --- a/src/aig/ioa/ioa.h +++ b/src/aig/ioa/ioa.h @@ -31,9 +31,9 @@ #include #include -#include "src/misc/vec/vec.h" +#include "misc/vec/vec.h" //#include "bar.h" -#include "src/aig/aig/aig.h" +#include "aig/aig/aig.h" //////////////////////////////////////////////////////////////////////// /// PARAMETERS /// diff --git a/src/aig/ivy/ivy.h b/src/aig/ivy/ivy.h index f0292e6c..1cce1217 100644 --- a/src/aig/ivy/ivy.h +++ b/src/aig/ivy/ivy.h @@ -27,8 +27,8 @@ //////////////////////////////////////////////////////////////////////// #include -#include "src/misc/extra/extra.h" -#include "src/misc/vec/vec.h" +#include "misc/extra/extra.h" +#include "misc/vec/vec.h" //////////////////////////////////////////////////////////////////////// /// PARAMETERS /// diff --git a/src/aig/ivy/ivyFraig.c b/src/aig/ivy/ivyFraig.c index 411402fb..d4cbd57a 100644 --- a/src/aig/ivy/ivyFraig.c +++ b/src/aig/ivy/ivyFraig.c @@ -20,8 +20,8 @@ #include -#include "src/sat/bsat/satSolver.h" -#include "src/misc/extra/extra.h" +#include "sat/bsat/satSolver.h" +#include "misc/extra/extra.h" #include "ivy.h" ABC_NAMESPACE_IMPL_START @@ -2659,7 +2659,7 @@ p->timeTrav += clock() - clk; ABC_NAMESPACE_IMPL_END -#include "src/bdd/cudd/cuddInt.h" +#include "bdd/cudd/cuddInt.h" ABC_NAMESPACE_IMPL_START @@ -2817,7 +2817,7 @@ int Ivy_FraigNodesAreEquivBdd( Ivy_Obj_t * pObj1, Ivy_Obj_t * pObj2 ) ABC_NAMESPACE_IMPL_END -#include "src/aig/aig/aig.h" +#include "aig/aig/aig.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/ivy/ivyRwr.c b/src/aig/ivy/ivyRwr.c index 292bd3f9..2e3689c1 100644 --- a/src/aig/ivy/ivyRwr.c +++ b/src/aig/ivy/ivyRwr.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "ivy.h" -#include "src/bool/deco/deco.h" -#include "src/opt/rwt/rwt.h" +#include "bool/deco/deco.h" +#include "opt/rwt/rwt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/ivy/ivySeq.c b/src/aig/ivy/ivySeq.c index 4a999780..c905fa62 100644 --- a/src/aig/ivy/ivySeq.c +++ b/src/aig/ivy/ivySeq.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "ivy.h" -#include "src/bool/deco/deco.h" -#include "src/opt/rwt/rwt.h" +#include "bool/deco/deco.h" +#include "opt/rwt/rwt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/saig/saig.h b/src/aig/saig/saig.h index 8752082f..ec33b3eb 100644 --- a/src/aig/saig/saig.h +++ b/src/aig/saig/saig.h @@ -26,8 +26,8 @@ /// INCLUDES /// //////////////////////////////////////////////////////////////////////// -#include "src/aig/aig/aig.h" -#include "src/aig/gia/giaAbs.h" +#include "aig/aig/aig.h" +#include "aig/gia/giaAbs.h" ABC_NAMESPACE_HEADER_START diff --git a/src/aig/saig/saigAbsCba.c b/src/aig/saig/saigAbsCba.c index 5a73a4d0..8f2cafaa 100644 --- a/src/aig/saig/saigAbsCba.c +++ b/src/aig/saig/saigAbsCba.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "saig.h" -#include "src/aig/gia/giaAig.h" -#include "src/aig/ioa/ioa.h" +#include "aig/gia/giaAig.h" +#include "aig/ioa/ioa.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/saig/saigAbsPba.c b/src/aig/saig/saigAbsPba.c index 9a10edb6..34e1decf 100644 --- a/src/aig/saig/saigAbsPba.c +++ b/src/aig/saig/saigAbsPba.c @@ -19,9 +19,9 @@ ***********************************************************************/ #include "saig.h" -#include "src/sat/cnf/cnf.h" -#include "src/sat/bsat/satSolver.h" -#include "src/aig/gia/giaAig.h" +#include "sat/cnf/cnf.h" +#include "sat/bsat/satSolver.h" +#include "aig/gia/giaAig.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/saig/saigAbsStart.c b/src/aig/saig/saigAbsStart.c index 77517c18..51033dee 100644 --- a/src/aig/saig/saigAbsStart.c +++ b/src/aig/saig/saigAbsStart.c @@ -19,10 +19,10 @@ ***********************************************************************/ #include "saig.h" -#include "src/proof/ssw/ssw.h" -#include "src/proof/fra/fra.h" -#include "src/proof/bbr/bbr.h" -#include "src/proof/pdr/pdr.h" +#include "proof/ssw/ssw.h" +#include "proof/fra/fra.h" +#include "proof/bbr/bbr.h" +#include "proof/pdr/pdr.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/saig/saigAbsVfa.c b/src/aig/saig/saigAbsVfa.c index e991ac35..2c3ebbff 100644 --- a/src/aig/saig/saigAbsVfa.c +++ b/src/aig/saig/saigAbsVfa.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "saig.h" -#include "src/sat/cnf/cnf.h" -#include "src/sat/bsat/satSolver.h" +#include "sat/cnf/cnf.h" +#include "sat/bsat/satSolver.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/saig/saigBmc.c b/src/aig/saig/saigBmc.c index 021ad5d0..f88d3162 100644 --- a/src/aig/saig/saigBmc.c +++ b/src/aig/saig/saigBmc.c @@ -19,9 +19,9 @@ ***********************************************************************/ #include "saig.h" -#include "src/proof/fra/fra.h" -#include "src/sat/cnf/cnf.h" -#include "src/sat/bsat/satStore.h" +#include "proof/fra/fra.h" +#include "sat/cnf/cnf.h" +#include "sat/bsat/satStore.h" ABC_NAMESPACE_IMPL_START @@ -167,7 +167,7 @@ Aig_Man_t * Saig_ManFramesBmcLimit( Aig_Man_t * pAig, int nFrames, int nSizeMax ABC_NAMESPACE_IMPL_END -#include "src/misc/util/utilMem.h" +#include "misc/util/utilMem.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/saig/saigBmc2.c b/src/aig/saig/saigBmc2.c index 8ff9a7a7..92e701a1 100644 --- a/src/aig/saig/saigBmc2.c +++ b/src/aig/saig/saigBmc2.c @@ -19,9 +19,9 @@ ***********************************************************************/ #include "saig.h" -#include "src/sat/cnf/cnf.h" -#include "src/sat/bsat/satStore.h" -#include "src/proof/ssw/ssw.h" +#include "sat/cnf/cnf.h" +#include "sat/bsat/satStore.h" +#include "proof/ssw/ssw.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/saig/saigBmc3.c b/src/aig/saig/saigBmc3.c index 12e982cc..973112b2 100644 --- a/src/aig/saig/saigBmc3.c +++ b/src/aig/saig/saigBmc3.c @@ -19,9 +19,9 @@ ***********************************************************************/ #include "saig.h" -#include "src/proof/fra/fra.h" -#include "src/sat/cnf/cnf.h" -#include "src/sat/bsat/satStore.h" +#include "proof/fra/fra.h" +#include "sat/cnf/cnf.h" +#include "sat/bsat/satStore.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/saig/saigCexMin.c b/src/aig/saig/saigCexMin.c index e50ba4c7..f0fca2c4 100644 --- a/src/aig/saig/saigCexMin.c +++ b/src/aig/saig/saigCexMin.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "saig.h" -#include "src/aig/ioa/ioa.h" +#include "aig/ioa/ioa.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/saig/saigConstr.c b/src/aig/saig/saigConstr.c index 6b90f2c1..6c258505 100644 --- a/src/aig/saig/saigConstr.c +++ b/src/aig/saig/saigConstr.c @@ -19,10 +19,10 @@ ***********************************************************************/ #include "saig.h" -#include "src/sat/cnf/cnf.h" -#include "src/sat/bsat/satSolver.h" -#include "src/bool/kit/kit.h" -#include "src/aig/ioa/ioa.h" +#include "sat/cnf/cnf.h" +#include "sat/bsat/satSolver.h" +#include "bool/kit/kit.h" +#include "aig/ioa/ioa.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/saig/saigConstr2.c b/src/aig/saig/saigConstr2.c index 85e79e3f..1d842b3c 100644 --- a/src/aig/saig/saigConstr2.c +++ b/src/aig/saig/saigConstr2.c @@ -19,10 +19,10 @@ ***********************************************************************/ #include "saig.h" -#include "src/sat/cnf/cnf.h" -#include "src/sat/bsat/satSolver.h" -#include "src/bool/kit/kit.h" -#include "src/misc/bar/bar.h" +#include "sat/cnf/cnf.h" +#include "sat/bsat/satSolver.h" +#include "bool/kit/kit.h" +#include "misc/bar/bar.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/saig/saigGlaCba.c b/src/aig/saig/saigGlaCba.c index d39ff944..162795b0 100644 --- a/src/aig/saig/saigGlaCba.c +++ b/src/aig/saig/saigGlaCba.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "saig.h" -#include "src/sat/bsat/satSolver.h" -#include "src/sat/cnf/cnf.h" +#include "sat/bsat/satSolver.h" +#include "sat/cnf/cnf.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/saig/saigGlaPba.c b/src/aig/saig/saigGlaPba.c index e039ed75..14f47c5c 100644 --- a/src/aig/saig/saigGlaPba.c +++ b/src/aig/saig/saigGlaPba.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "saig.h" -#include "src/sat/bsat/satSolver.h" -#include "src/sat/bsat/satStore.h" +#include "sat/bsat/satSolver.h" +#include "sat/bsat/satStore.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/saig/saigGlaPba2.c b/src/aig/saig/saigGlaPba2.c index 42850e01..5e745f4c 100644 --- a/src/aig/saig/saigGlaPba2.c +++ b/src/aig/saig/saigGlaPba2.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "saig.h" -#include "src/sat/bsat/satSolver2.h" +#include "sat/bsat/satSolver2.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/saig/saigHaig.c b/src/aig/saig/saigHaig.c index d06dc758..7cb34c5d 100644 --- a/src/aig/saig/saigHaig.c +++ b/src/aig/saig/saigHaig.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "saig.h" -#include "src/sat/bsat/satSolver.h" -#include "src/sat/cnf/cnf.h" +#include "sat/bsat/satSolver.h" +#include "sat/cnf/cnf.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/saig/saigInd.c b/src/aig/saig/saigInd.c index 39ec734a..f9cccae8 100644 --- a/src/aig/saig/saigInd.c +++ b/src/aig/saig/saigInd.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "saig.h" -#include "src/sat/cnf/cnf.h" -#include "src/sat/bsat/satSolver.h" +#include "sat/cnf/cnf.h" +#include "sat/bsat/satSolver.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/saig/saigIso.c b/src/aig/saig/saigIso.c index be97aa74..1c319af7 100644 --- a/src/aig/saig/saigIso.c +++ b/src/aig/saig/saigIso.c @@ -18,7 +18,7 @@ ***********************************************************************/ -#include "src/aig/ioa/ioa.h" +#include "aig/ioa/ioa.h" #include "saig.h" ABC_NAMESPACE_IMPL_START @@ -575,7 +575,7 @@ Aig_Man_t * Saig_ManIsoReduce( Aig_Man_t * pAig, Vec_Ptr_t ** pvPosEquivs, int f } -#include "src/base/abc/abc.h" +#include "base/abc/abc.h" /**Function************************************************************* diff --git a/src/aig/saig/saigMiter.c b/src/aig/saig/saigMiter.c index f3f6f279..8ebb81dd 100644 --- a/src/aig/saig/saigMiter.c +++ b/src/aig/saig/saigMiter.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "saig.h" -#include "src/proof/fra/fra.h" +#include "proof/fra/fra.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/saig/saigOutDec.c b/src/aig/saig/saigOutDec.c index d059a935..13c4ad74 100644 --- a/src/aig/saig/saigOutDec.c +++ b/src/aig/saig/saigOutDec.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "saig.h" -#include "src/sat/cnf/cnf.h" -#include "src/sat/bsat/satSolver.h" +#include "sat/cnf/cnf.h" +#include "sat/bsat/satSolver.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/saig/saigRefSat.c b/src/aig/saig/saigRefSat.c index d99320ce..fc03e182 100644 --- a/src/aig/saig/saigRefSat.c +++ b/src/aig/saig/saigRefSat.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "saig.h" -#include "src/sat/cnf/cnf.h" -#include "src/sat/bsat/satSolver.h" +#include "sat/cnf/cnf.h" +#include "sat/bsat/satSolver.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/saig/saigRetMin.c b/src/aig/saig/saigRetMin.c index 161fce0a..ff3e45df 100644 --- a/src/aig/saig/saigRetMin.c +++ b/src/aig/saig/saigRetMin.c @@ -20,10 +20,10 @@ #include "saig.h" -#include "src/opt/nwk/nwk.h" -#include "src/sat/cnf/cnf.h" -#include "src/sat/bsat/satSolver.h" -#include "src/sat/bsat/satStore.h" +#include "opt/nwk/nwk.h" +#include "sat/cnf/cnf.h" +#include "sat/bsat/satSolver.h" +#include "sat/bsat/satStore.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/saig/saigSimExt.c b/src/aig/saig/saigSimExt.c index 36f3d903..1a5ec7e5 100644 --- a/src/aig/saig/saigSimExt.c +++ b/src/aig/saig/saigSimExt.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "saig.h" -#include "src/proof/ssw/ssw.h" +#include "proof/ssw/ssw.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/saig/saigSimExt2.c b/src/aig/saig/saigSimExt2.c index 335c4034..ca46c0b3 100644 --- a/src/aig/saig/saigSimExt2.c +++ b/src/aig/saig/saigSimExt2.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "saig.h" -#include "src/proof/ssw/ssw.h" +#include "proof/ssw/ssw.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/saig/saigSimFast.c b/src/aig/saig/saigSimFast.c index e54e58ac..6b669eb9 100644 --- a/src/aig/saig/saigSimFast.c +++ b/src/aig/saig/saigSimFast.c @@ -20,7 +20,7 @@ #include "saig.h" -#include "src/base/main/main.h" +#include "base/main/main.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/saig/saigSimSeq.c b/src/aig/saig/saigSimSeq.c index ee4085b1..f71b74cb 100644 --- a/src/aig/saig/saigSimSeq.c +++ b/src/aig/saig/saigSimSeq.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "saig.h" -#include "src/proof/ssw/ssw.h" +#include "proof/ssw/ssw.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/saig/saigStrSim.c b/src/aig/saig/saigStrSim.c index 2feaba1b..85297abc 100644 --- a/src/aig/saig/saigStrSim.c +++ b/src/aig/saig/saigStrSim.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "saig.h" -#include "src/proof/ssw/ssw.h" +#include "proof/ssw/ssw.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/saig/saigSwitch.c b/src/aig/saig/saigSwitch.c index 8f4f962f..b7e6ba8f 100644 --- a/src/aig/saig/saigSwitch.c +++ b/src/aig/saig/saigSwitch.c @@ -20,7 +20,7 @@ #include "saig.h" -#include "src/base/main/main.h" +#include "base/main/main.h" ABC_NAMESPACE_IMPL_START diff --git a/src/aig/saig/saigTrans.c b/src/aig/saig/saigTrans.c index 55c9772a..5e7b719b 100644 --- a/src/aig/saig/saigTrans.c +++ b/src/aig/saig/saigTrans.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "saig.h" -#include "src/proof/fra/fra.h" +#include "proof/fra/fra.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abc/abc.h b/src/base/abc/abc.h index cbebf318..00659fd8 100644 --- a/src/base/abc/abc.h +++ b/src/base/abc/abc.h @@ -31,14 +31,14 @@ #include #include -#include "src/misc/vec/vec.h" -#include "src/aig/hop/hop.h" -#include "src/misc/st/st.h" -#include "src/misc/st/stmm.h" -#include "src/misc/nm/nm.h" -#include "src/misc/mem/mem.h" -#include "src/misc/util/utilCex.h" -#include "src/misc/extra/extra.h" +#include "misc/vec/vec.h" +#include "aig/hop/hop.h" +#include "misc/st/st.h" +#include "misc/st/stmm.h" +#include "misc/nm/nm.h" +#include "misc/mem/mem.h" +#include "misc/util/utilCex.h" +#include "misc/extra/extra.h" //////////////////////////////////////////////////////////////////////// /// PARAMETERS /// diff --git a/src/base/abc/abcBlifMv.c b/src/base/abc/abcBlifMv.c index 47a4c15e..ab0966a9 100644 --- a/src/base/abc/abcBlifMv.c +++ b/src/base/abc/abcBlifMv.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "abc.h" -#include "src/misc/extra/extraBdd.h" +#include "misc/extra/extraBdd.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abc/abcCheck.c b/src/base/abc/abcCheck.c index a80c4372..bc3399e0 100644 --- a/src/base/abc/abcCheck.c +++ b/src/base/abc/abcCheck.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "abc.h" -#include "src/base/main/main.h" -#include "src/misc/extra/extraBdd.h" +#include "base/main/main.h" +#include "misc/extra/extraBdd.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abc/abcFunc.c b/src/base/abc/abcFunc.c index 86604f39..4280b75f 100644 --- a/src/base/abc/abcFunc.c +++ b/src/base/abc/abcFunc.c @@ -19,9 +19,9 @@ ***********************************************************************/ #include "abc.h" -#include "src/base/main/main.h" -#include "src/map/mio/mio.h" -#include "src/misc/extra/extraBdd.h" +#include "base/main/main.h" +#include "map/mio/mio.h" +#include "misc/extra/extraBdd.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abc/abcHieCec.c b/src/base/abc/abcHieCec.c index 83a332c2..707acc12 100644 --- a/src/base/abc/abcHieCec.c +++ b/src/base/abc/abcHieCec.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "abc.h" -#include "src/base/io/ioAbc.h" -#include "src/aig/gia/gia.h" +#include "base/io/ioAbc.h" +#include "aig/gia/gia.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abc/abcHieNew.c b/src/base/abc/abcHieNew.c index fe1496d9..2bdc7f28 100644 --- a/src/base/abc/abcHieNew.c +++ b/src/base/abc/abcHieNew.c @@ -23,9 +23,9 @@ #include #include -#include "src/misc/vec/vec.h" -#include "src/misc/util/utilNam.h" -#include "src/misc/extra/extra.h" +#include "misc/vec/vec.h" +#include "misc/util/utilNam.h" +#include "misc/extra/extra.h" ABC_NAMESPACE_IMPL_START @@ -1108,7 +1108,7 @@ Au_Ntk_t * Au_NtkParseCBlif( char * pFileName ) #include "abc.h" -#include "src/aig/gia/gia.h" +#include "aig/gia/gia.h" extern Vec_Ptr_t * Abc_NtkDfsBoxes( Abc_Ntk_t * pNtk ); extern int Abc_NtkDeriveFlatGiaSop( Gia_Man_t * pGia, int * gFanins, char * pSop ); diff --git a/src/base/abc/abcLatch.c b/src/base/abc/abcLatch.c index 865fb8b9..61cae164 100644 --- a/src/base/abc/abcLatch.c +++ b/src/base/abc/abcLatch.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "abc.h" -#include "src/misc/extra/extraBdd.h" +#include "misc/extra/extraBdd.h" ABC_NAMESPACE_IMPL_START @@ -486,7 +486,7 @@ Abc_Ntk_t * Abc_NtkConvertOnehot( Abc_Ntk_t * pNtk ) ABC_NAMESPACE_IMPL_END -#include "src/aig/gia/giaAig.h" +#include "aig/gia/giaAig.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abc/abcMinBase.c b/src/base/abc/abcMinBase.c index 2efe404f..f61eb292 100644 --- a/src/base/abc/abcMinBase.c +++ b/src/base/abc/abcMinBase.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "abc.h" -#include "src/misc/extra/extraBdd.h" +#include "misc/extra/extraBdd.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abc/abcNetlist.c b/src/base/abc/abcNetlist.c index f8ff8f0c..4dfb7fe2 100644 --- a/src/base/abc/abcNetlist.c +++ b/src/base/abc/abcNetlist.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "abc.h" -#include "src/base/main/main.h" +#include "base/main/main.h" //#include "seq.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abc/abcNtk.c b/src/base/abc/abcNtk.c index 30eb0873..d7f14810 100644 --- a/src/base/abc/abcNtk.c +++ b/src/base/abc/abcNtk.c @@ -20,10 +20,10 @@ #include "abc.h" #include "abcInt.h" -#include "src/base/main/main.h" -#include "src/map/mio/mio.h" -#include "src/aig/gia/gia.h" -#include "src/misc/extra/extraBdd.h" +#include "base/main/main.h" +#include "map/mio/mio.h" +#include "aig/gia/gia.h" +#include "misc/extra/extraBdd.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abc/abcObj.c b/src/base/abc/abcObj.c index 901ffa31..684e6b65 100644 --- a/src/base/abc/abcObj.c +++ b/src/base/abc/abcObj.c @@ -20,9 +20,9 @@ #include "abc.h" #include "abcInt.h" -#include "src/base/main/main.h" -#include "src/map/mio/mio.h" -#include "src/misc/extra/extraBdd.h" +#include "base/main/main.h" +#include "map/mio/mio.h" +#include "misc/extra/extraBdd.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abc/abcShow.c b/src/base/abc/abcShow.c index 2b7370ae..e1baffa1 100644 --- a/src/base/abc/abcShow.c +++ b/src/base/abc/abcShow.c @@ -26,9 +26,9 @@ #include "abc.h" -#include "src/base/main/main.h" -#include "src/base/io/ioAbc.h" -#include "src/misc/extra/extraBdd.h" +#include "base/main/main.h" +#include "base/io/ioAbc.h" +#include "misc/extra/extraBdd.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abc/abcUtil.c b/src/base/abc/abcUtil.c index 98fdfbfa..bffbf40e 100644 --- a/src/base/abc/abcUtil.c +++ b/src/base/abc/abcUtil.c @@ -19,10 +19,10 @@ ***********************************************************************/ #include "abc.h" -#include "src/base/main/main.h" -#include "src/map/mio/mio.h" -#include "src/bool/dec/dec.h" -#include "src/misc/extra/extraBdd.h" +#include "base/main/main.h" +#include "map/mio/mio.h" +#include "bool/dec/dec.h" +#include "misc/extra/extraBdd.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abc.c b/src/base/abci/abc.c index 03eb8d21..b3f4d559 100644 --- a/src/base/abci/abc.c +++ b/src/base/abci/abc.c @@ -18,37 +18,37 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/base/main/main.h" -#include "src/base/main/mainInt.h" -#include "src/proof/fraig/fraig.h" -#include "src/opt/fxu/fxu.h" -#include "src/opt/cut/cut.h" -#include "src/map/fpga/fpga.h" -#include "src/map/if/if.h" -#include "src/opt/sim/sim.h" -#include "src/opt/res/res.h" -#include "src/opt/lpk/lpk.h" -#include "src/aig/gia/giaAig.h" -#include "src/opt/dar/dar.h" -#include "src/opt/mfs/mfs.h" -#include "src/proof/fra/fra.h" -#include "src/aig/saig/saig.h" -#include "src/proof/int/int.h" -#include "src/proof/dch/dch.h" -#include "src/proof/ssw/ssw.h" -#include "src/opt/cgt/cgt.h" -#include "src/bool/kit/kit.h" -#include "src/map/amap/amap.h" -#include "src/opt/ret/retInt.h" -#include "src/sat/cnf/cnf.h" -#include "src/proof/cec/cec.h" -#include "src/proof/pdr/pdr.h" -#include "src/misc/tim/tim.h" -#include "src/proof/llb/llb.h" -#include "src/proof/bbr/bbr.h" -#include "src/map/cov/cov.h" -#include "src/base/cmd/cmd.h" +#include "base/abc/abc.h" +#include "base/main/main.h" +#include "base/main/mainInt.h" +#include "proof/fraig/fraig.h" +#include "opt/fxu/fxu.h" +#include "opt/cut/cut.h" +#include "map/fpga/fpga.h" +#include "map/if/if.h" +#include "opt/sim/sim.h" +#include "opt/res/res.h" +#include "opt/lpk/lpk.h" +#include "aig/gia/giaAig.h" +#include "opt/dar/dar.h" +#include "opt/mfs/mfs.h" +#include "proof/fra/fra.h" +#include "aig/saig/saig.h" +#include "proof/int/int.h" +#include "proof/dch/dch.h" +#include "proof/ssw/ssw.h" +#include "opt/cgt/cgt.h" +#include "bool/kit/kit.h" +#include "map/amap/amap.h" +#include "opt/ret/retInt.h" +#include "sat/cnf/cnf.h" +#include "proof/cec/cec.h" +#include "proof/pdr/pdr.h" +#include "misc/tim/tim.h" +#include "proof/llb/llb.h" +#include "proof/bbr/bbr.h" +#include "map/cov/cov.h" +#include "base/cmd/cmd.h" #ifdef _WIN32 //#include diff --git a/src/base/abci/abcAttach.c b/src/base/abci/abcAttach.c index 6408b54f..ad435d6d 100644 --- a/src/base/abci/abcAttach.c +++ b/src/base/abci/abcAttach.c @@ -18,9 +18,9 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/base/main/main.h" -#include "src/map/mio/mio.h" +#include "base/abc/abc.h" +#include "base/main/main.h" +#include "map/mio/mio.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcAuto.c b/src/base/abci/abcAuto.c index 7b4d7694..3d723b1c 100644 --- a/src/base/abci/abcAuto.c +++ b/src/base/abci/abcAuto.c @@ -18,8 +18,8 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/misc/extra/extraBdd.h" +#include "base/abc/abc.h" +#include "misc/extra/extraBdd.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcBalance.c b/src/base/abci/abcBalance.c index 8317558d..2c391e89 100644 --- a/src/base/abci/abcBalance.c +++ b/src/base/abci/abcBalance.c @@ -18,7 +18,7 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" +#include "base/abc/abc.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcBidec.c b/src/base/abci/abcBidec.c index 507b7355..22564195 100644 --- a/src/base/abci/abcBidec.c +++ b/src/base/abci/abcBidec.c @@ -18,9 +18,9 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/bool/bdc/bdc.h" -#include "src/bool/kit/kit.h" +#include "base/abc/abc.h" +#include "bool/bdc/bdc.h" +#include "bool/kit/kit.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcBm.c b/src/base/abci/abcBm.c index 19c8e9ff..741c6a9e 100644 --- a/src/base/abci/abcBm.c +++ b/src/base/abci/abcBm.c @@ -27,10 +27,10 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/opt/sim/sim.h" -#include "src/sat/bsat/satSolver.h" -#include "src/misc/extra/extraBdd.h" +#include "base/abc/abc.h" +#include "opt/sim/sim.h" +#include "sat/bsat/satSolver.h" +#include "misc/extra/extraBdd.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcBmc.c b/src/base/abci/abcBmc.c index 6ea4435c..ec04df51 100644 --- a/src/base/abci/abcBmc.c +++ b/src/base/abci/abcBmc.c @@ -18,8 +18,8 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/aig/ivy/ivy.h" +#include "base/abc/abc.h" +#include "aig/ivy/ivy.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcCas.c b/src/base/abci/abcCas.c index 51ab4130..f9fae27f 100644 --- a/src/base/abci/abcCas.c +++ b/src/base/abci/abcCas.c @@ -18,8 +18,8 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/misc/extra/extraBdd.h" +#include "base/abc/abc.h" +#include "misc/extra/extraBdd.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcCascade.c b/src/base/abci/abcCascade.c index 60f7294f..bb6e1d4b 100644 --- a/src/base/abci/abcCascade.c +++ b/src/base/abci/abcCascade.c @@ -18,9 +18,9 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/bdd/reo/reo.h" -#include "src/misc/extra/extraBdd.h" +#include "base/abc/abc.h" +#include "bdd/reo/reo.h" +#include "misc/extra/extraBdd.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcCollapse.c b/src/base/abci/abcCollapse.c index e6a6db79..6d3fbbce 100644 --- a/src/base/abci/abcCollapse.c +++ b/src/base/abci/abcCollapse.c @@ -18,8 +18,8 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/misc/extra/extraBdd.h" +#include "base/abc/abc.h" +#include "misc/extra/extraBdd.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcCut.c b/src/base/abci/abcCut.c index 918ee2ab..bf64ce99 100644 --- a/src/base/abci/abcCut.c +++ b/src/base/abci/abcCut.c @@ -18,8 +18,8 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/opt/cut/cut.h" +#include "base/abc/abc.h" +#include "opt/cut/cut.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcDar.c b/src/base/abci/abcDar.c index 82b3d916..bd299425 100644 --- a/src/base/abci/abcDar.c +++ b/src/base/abci/abcDar.c @@ -18,22 +18,22 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/base/main/main.h" -#include "src/aig/gia/giaAig.h" -#include "src/opt/dar/dar.h" -#include "src/sat/cnf/cnf.h" -#include "src/proof/fra/fra.h" -#include "src/proof/fraig/fraig.h" -#include "src/proof/int/int.h" -#include "src/proof/dch/dch.h" -#include "src/proof/ssw/ssw.h" -#include "src/opt/cgt/cgt.h" -#include "src/proof/bbr/bbr.h" -#include "src/aig/gia/gia.h" -#include "src/proof/cec/cec.h" -#include "src/opt/csw/csw.h" -#include "src/proof/pdr/pdr.h" +#include "base/abc/abc.h" +#include "base/main/main.h" +#include "aig/gia/giaAig.h" +#include "opt/dar/dar.h" +#include "sat/cnf/cnf.h" +#include "proof/fra/fra.h" +#include "proof/fraig/fraig.h" +#include "proof/int/int.h" +#include "proof/dch/dch.h" +#include "proof/ssw/ssw.h" +#include "opt/cgt/cgt.h" +#include "proof/bbr/bbr.h" +#include "aig/gia/gia.h" +#include "proof/cec/cec.h" +#include "opt/csw/csw.h" +#include "proof/pdr/pdr.h" ABC_NAMESPACE_IMPL_START @@ -1833,7 +1833,7 @@ Abc_Ntk_t * Abc_NtkDarLcorrNew( Abc_Ntk_t * pNtk, int nVarsMax, int nConfMax, in /* #include -#include "src/misc/util/utilMem.h" +#include "misc/util/utilMem.h" static void sigfunc( int signo ) { if (signo == SIGINT) { @@ -3991,8 +3991,8 @@ int Abc_NtkDarReach( Abc_Ntk_t * pNtk, Saig_ParBbr_t * pPars ) ABC_NAMESPACE_IMPL_END -#include "src/map/amap/amap.h" -#include "src/map/mio/mio.h" +#include "map/amap/amap.h" +#include "map/mio/mio.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcDebug.c b/src/base/abci/abcDebug.c index ebed2efa..7dae346c 100644 --- a/src/base/abci/abcDebug.c +++ b/src/base/abci/abcDebug.c @@ -18,8 +18,8 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/base/io/ioAbc.h" +#include "base/abc/abc.h" +#include "base/io/ioAbc.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcDress.c b/src/base/abci/abcDress.c index 745dcac0..2a453b63 100644 --- a/src/base/abci/abcDress.c +++ b/src/base/abci/abcDress.c @@ -18,8 +18,8 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/base/io/ioAbc.h" +#include "base/abc/abc.h" +#include "base/io/ioAbc.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcDress2.c b/src/base/abci/abcDress2.c index 84bf1229..9f8cc568 100644 --- a/src/base/abci/abcDress2.c +++ b/src/base/abci/abcDress2.c @@ -18,9 +18,9 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/aig/aig/aig.h" -#include "src/proof/dch/dch.h" +#include "base/abc/abc.h" +#include "aig/aig/aig.h" +#include "proof/dch/dch.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcDsd.c b/src/base/abci/abcDsd.c index c4086ce7..24496145 100644 --- a/src/base/abci/abcDsd.c +++ b/src/base/abci/abcDsd.c @@ -18,9 +18,9 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/misc/extra/extraBdd.h" -#include "src/bdd/dsd/dsd.h" +#include "base/abc/abc.h" +#include "misc/extra/extraBdd.h" +#include "bdd/dsd/dsd.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcExtract.c b/src/base/abci/abcExtract.c index e718c8ce..1b247841 100644 --- a/src/base/abci/abcExtract.c +++ b/src/base/abci/abcExtract.c @@ -18,7 +18,7 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" +#include "base/abc/abc.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcFpga.c b/src/base/abci/abcFpga.c index 4d6b2978..965bd5f8 100644 --- a/src/base/abci/abcFpga.c +++ b/src/base/abci/abcFpga.c @@ -18,9 +18,9 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/map/fpga/fpgaInt.h" -#include "src/misc/extra/extraBdd.h" +#include "base/abc/abc.h" +#include "map/fpga/fpgaInt.h" +#include "misc/extra/extraBdd.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcFpgaFast.c b/src/base/abci/abcFpgaFast.c index 1c5693fd..21399f3d 100644 --- a/src/base/abci/abcFpgaFast.c +++ b/src/base/abci/abcFpgaFast.c @@ -18,8 +18,8 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/aig/ivy/ivy.h" +#include "base/abc/abc.h" +#include "aig/ivy/ivy.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcFraig.c b/src/base/abci/abcFraig.c index 23004df2..60b8d662 100644 --- a/src/base/abci/abcFraig.c +++ b/src/base/abci/abcFraig.c @@ -18,9 +18,9 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/proof/fraig/fraig.h" -#include "src/base/main/main.h" +#include "base/abc/abc.h" +#include "proof/fraig/fraig.h" +#include "base/main/main.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcFxu.c b/src/base/abci/abcFxu.c index 2470a1d1..9cf2e31a 100644 --- a/src/base/abci/abcFxu.c +++ b/src/base/abci/abcFxu.c @@ -18,8 +18,8 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/opt/fxu/fxu.h" +#include "base/abc/abc.h" +#include "opt/fxu/fxu.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcGen.c b/src/base/abci/abcGen.c index 4f3ef5bc..fb6f8b27 100644 --- a/src/base/abci/abcGen.c +++ b/src/base/abci/abcGen.c @@ -18,7 +18,7 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" +#include "base/abc/abc.h" ABC_NAMESPACE_IMPL_START @@ -660,7 +660,7 @@ void Abc_GenOneHotIntervals( char * pFileName, int nPis, int nRegs, Vec_Ptr_t * ABC_NAMESPACE_IMPL_END -#include "src/aig/aig/aig.h" +#include "aig/aig/aig.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcHaig.c b/src/base/abci/abcHaig.c index 073defd0..d6c0ddad 100644 --- a/src/base/abci/abcHaig.c +++ b/src/base/abci/abcHaig.c @@ -18,7 +18,7 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" +#include "base/abc/abc.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcIf.c b/src/base/abci/abcIf.c index 0a4b9d56..01d156e1 100644 --- a/src/base/abci/abcIf.c +++ b/src/base/abci/abcIf.c @@ -18,11 +18,11 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/base/main/main.h" -#include "src/map/if/if.h" -#include "src/bool/kit/kit.h" -#include "src/aig/aig/aig.h" +#include "base/abc/abc.h" +#include "base/main/main.h" +#include "map/if/if.h" +#include "bool/kit/kit.h" +#include "aig/aig/aig.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcIfMux.c b/src/base/abci/abcIfMux.c index 545adafb..69098b4f 100644 --- a/src/base/abci/abcIfMux.c +++ b/src/base/abci/abcIfMux.c @@ -18,8 +18,8 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/map/if/if.h" +#include "base/abc/abc.h" +#include "map/if/if.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcIfif.c b/src/base/abci/abcIfif.c index 33f1299c..d8cfa541 100644 --- a/src/base/abci/abcIfif.c +++ b/src/base/abci/abcIfif.c @@ -18,8 +18,8 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/map/if/if.h" +#include "base/abc/abc.h" +#include "map/if/if.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcIvy.c b/src/base/abci/abcIvy.c index 8df8d150..2d53a1ee 100644 --- a/src/base/abci/abcIvy.c +++ b/src/base/abci/abcIvy.c @@ -18,14 +18,14 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/bool/dec/dec.h" -#include "src/proof/fra/fra.h" -#include "src/aig/ivy/ivy.h" -#include "src/proof/fraig/fraig.h" -#include "src/map/mio/mio.h" -#include "src/aig/aig/aig.h" -#include "src/misc/extra/extraBdd.h" +#include "base/abc/abc.h" +#include "bool/dec/dec.h" +#include "proof/fra/fra.h" +#include "aig/ivy/ivy.h" +#include "proof/fraig/fraig.h" +#include "map/mio/mio.h" +#include "aig/aig/aig.h" +#include "misc/extra/extraBdd.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcLog.c b/src/base/abci/abcLog.c index d2dddaa2..64f5d548 100644 --- a/src/base/abci/abcLog.c +++ b/src/base/abci/abcLog.c @@ -18,8 +18,8 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/aig/gia/gia.h" +#include "base/abc/abc.h" +#include "aig/gia/gia.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcLut.c b/src/base/abci/abcLut.c index 1653918f..66db8e97 100644 --- a/src/base/abci/abcLut.c +++ b/src/base/abci/abcLut.c @@ -18,8 +18,8 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/opt/cut/cut.h" +#include "base/abc/abc.h" +#include "opt/cut/cut.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcLutmin.c b/src/base/abci/abcLutmin.c index bdeb53ff..b4856779 100644 --- a/src/base/abci/abcLutmin.c +++ b/src/base/abci/abcLutmin.c @@ -18,8 +18,8 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/misc/extra/extraBdd.h" +#include "base/abc/abc.h" +#include "misc/extra/extraBdd.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcMap.c b/src/base/abci/abcMap.c index 988da5c2..4b76a541 100644 --- a/src/base/abci/abcMap.c +++ b/src/base/abci/abcMap.c @@ -18,10 +18,10 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/base/main/main.h" -#include "src/map/mio/mio.h" -#include "src/map/mapper/mapper.h" +#include "base/abc/abc.h" +#include "base/main/main.h" +#include "map/mio/mio.h" +#include "map/mapper/mapper.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcMeasure.c b/src/base/abci/abcMeasure.c index a366b830..72dba1a0 100644 --- a/src/base/abci/abcMeasure.c +++ b/src/base/abci/abcMeasure.c @@ -18,8 +18,8 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/bool/kit/kit.h" +#include "base/abc/abc.h" +#include "bool/kit/kit.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcMerge.c b/src/base/abci/abcMerge.c index cc606488..52fa817b 100644 --- a/src/base/abci/abcMerge.c +++ b/src/base/abci/abcMerge.c @@ -18,9 +18,9 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/aig/aig/aig.h" -#include "src/opt/nwk/nwkMerge.h" +#include "base/abc/abc.h" +#include "aig/aig/aig.h" +#include "opt/nwk/nwkMerge.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcMffc.c b/src/base/abci/abcMffc.c index 3a911c67..f55b3b52 100644 --- a/src/base/abci/abcMffc.c +++ b/src/base/abci/abcMffc.c @@ -18,7 +18,7 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" +#include "base/abc/abc.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcMini.c b/src/base/abci/abcMini.c index 0af87d36..22f33909 100644 --- a/src/base/abci/abcMini.c +++ b/src/base/abci/abcMini.c @@ -18,7 +18,7 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" +#include "base/abc/abc.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcMiter.c b/src/base/abci/abcMiter.c index 66734c04..feeaa617 100644 --- a/src/base/abci/abcMiter.c +++ b/src/base/abci/abcMiter.c @@ -18,7 +18,7 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" +#include "base/abc/abc.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcMulti.c b/src/base/abci/abcMulti.c index c8247b28..8e4bbf28 100644 --- a/src/base/abci/abcMulti.c +++ b/src/base/abci/abcMulti.c @@ -18,8 +18,8 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/misc/extra/extraBdd.h" +#include "base/abc/abc.h" +#include "misc/extra/extraBdd.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcMv.c b/src/base/abci/abcMv.c index 5f612b62..d589c3e7 100644 --- a/src/base/abci/abcMv.c +++ b/src/base/abci/abcMv.c @@ -18,8 +18,8 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/misc/extra/extraBdd.h" +#include "base/abc/abc.h" +#include "misc/extra/extraBdd.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcNpnSave.c b/src/base/abci/abcNpnSave.c index b99b1e52..55603c6b 100644 --- a/src/base/abci/abcNpnSave.c +++ b/src/base/abci/abcNpnSave.c @@ -18,8 +18,8 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/aig/aig/aig.h" +#include "base/abc/abc.h" +#include "aig/aig/aig.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcNtbdd.c b/src/base/abci/abcNtbdd.c index 2fac9497..0fc8c36c 100644 --- a/src/base/abci/abcNtbdd.c +++ b/src/base/abci/abcNtbdd.c @@ -18,8 +18,8 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/misc/extra/extraBdd.h" +#include "base/abc/abc.h" +#include "misc/extra/extraBdd.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcOdc.c b/src/base/abci/abcOdc.c index ff85035b..31f64732 100644 --- a/src/base/abci/abcOdc.c +++ b/src/base/abci/abcOdc.c @@ -18,7 +18,7 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" +#include "base/abc/abc.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcOrder.c b/src/base/abci/abcOrder.c index a3f66a63..fb837848 100644 --- a/src/base/abci/abcOrder.c +++ b/src/base/abci/abcOrder.c @@ -18,7 +18,7 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" +#include "base/abc/abc.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcPart.c b/src/base/abci/abcPart.c index 163c81b9..a92decc1 100644 --- a/src/base/abci/abcPart.c +++ b/src/base/abci/abcPart.c @@ -18,9 +18,9 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/base/main/main.h" -#include "src/base/cmd/cmd.h" +#include "base/abc/abc.h" +#include "base/main/main.h" +#include "base/cmd/cmd.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcPrint.c b/src/base/abci/abcPrint.c index afedabc2..0ec73fde 100644 --- a/src/base/abci/abcPrint.c +++ b/src/base/abci/abcPrint.c @@ -19,13 +19,13 @@ ***********************************************************************/ #include -#include "src/base/abc/abc.h" -#include "src/bool/dec/dec.h" -#include "src/base/main/main.h" -#include "src/map/mio/mio.h" -#include "src/aig/aig/aig.h" -#include "src/map/if/if.h" -#include "src/misc/extra/extraBdd.h" +#include "base/abc/abc.h" +#include "bool/dec/dec.h" +#include "base/main/main.h" +#include "map/mio/mio.h" +#include "aig/aig/aig.h" +#include "map/if/if.h" +#include "misc/extra/extraBdd.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcProve.c b/src/base/abci/abcProve.c index 0322b587..c61777fa 100644 --- a/src/base/abci/abcProve.c +++ b/src/base/abci/abcProve.c @@ -20,9 +20,9 @@ #include -#include "src/base/abc/abc.h" -#include "src/proof/fraig/fraig.h" -#include "src/misc/extra/extraBdd.h" +#include "base/abc/abc.h" +#include "proof/fraig/fraig.h" +#include "misc/extra/extraBdd.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcQbf.c b/src/base/abci/abcQbf.c index 2fec2a07..0b53bc8a 100644 --- a/src/base/abci/abcQbf.c +++ b/src/base/abci/abcQbf.c @@ -18,7 +18,7 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" +#include "base/abc/abc.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcQuant.c b/src/base/abci/abcQuant.c index 0951795f..e6f0ccea 100644 --- a/src/base/abci/abcQuant.c +++ b/src/base/abci/abcQuant.c @@ -18,7 +18,7 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" +#include "base/abc/abc.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcReach.c b/src/base/abci/abcReach.c index 216dc2d2..e0fb4e51 100644 --- a/src/base/abci/abcReach.c +++ b/src/base/abci/abcReach.c @@ -18,8 +18,8 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/misc/extra/extraBdd.h" +#include "base/abc/abc.h" +#include "misc/extra/extraBdd.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcRec.c b/src/base/abci/abcRec.c index dd4beebd..83780233 100644 --- a/src/base/abci/abcRec.c +++ b/src/base/abci/abcRec.c @@ -18,9 +18,9 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/map/if/if.h" -#include "src/bool/kit/kit.h" +#include "base/abc/abc.h" +#include "map/if/if.h" +#include "bool/kit/kit.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcReconv.c b/src/base/abci/abcReconv.c index 4a5be4a2..56c2251a 100644 --- a/src/base/abci/abcReconv.c +++ b/src/base/abci/abcReconv.c @@ -18,8 +18,8 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/misc/extra/extraBdd.h" +#include "base/abc/abc.h" +#include "misc/extra/extraBdd.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcRefactor.c b/src/base/abci/abcRefactor.c index 22b88d28..cfc7bd39 100644 --- a/src/base/abci/abcRefactor.c +++ b/src/base/abci/abcRefactor.c @@ -18,9 +18,9 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/bool/dec/dec.h" -#include "src/misc/extra/extraBdd.h" +#include "base/abc/abc.h" +#include "bool/dec/dec.h" +#include "misc/extra/extraBdd.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcRenode.c b/src/base/abci/abcRenode.c index a3891fda..9fd6d0eb 100644 --- a/src/base/abci/abcRenode.c +++ b/src/base/abci/abcRenode.c @@ -18,11 +18,11 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/bdd/reo/reo.h" -#include "src/map/if/if.h" -#include "src/bool/kit/kit.h" -#include "src/misc/extra/extraBdd.h" +#include "base/abc/abc.h" +#include "bdd/reo/reo.h" +#include "map/if/if.h" +#include "bool/kit/kit.h" +#include "misc/extra/extraBdd.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcReorder.c b/src/base/abci/abcReorder.c index 5fd041ae..4f8d50fa 100644 --- a/src/base/abci/abcReorder.c +++ b/src/base/abci/abcReorder.c @@ -18,8 +18,8 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/bdd/reo/reo.h" +#include "base/abc/abc.h" +#include "bdd/reo/reo.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcRestruct.c b/src/base/abci/abcRestruct.c index 4be177f7..51af25c6 100644 --- a/src/base/abci/abcRestruct.c +++ b/src/base/abci/abcRestruct.c @@ -18,11 +18,11 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/bool/dec/dec.h" -#include "src/opt/cut/cut.h" -#include "src/misc/extra/extraBdd.h" -#include "src/bdd/dsd/dsd.h" +#include "base/abc/abc.h" +#include "bool/dec/dec.h" +#include "opt/cut/cut.h" +#include "misc/extra/extraBdd.h" +#include "bdd/dsd/dsd.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcResub.c b/src/base/abci/abcResub.c index 8ae4795a..3c970c9f 100644 --- a/src/base/abci/abcResub.c +++ b/src/base/abci/abcResub.c @@ -18,8 +18,8 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/bool/dec/dec.h" +#include "base/abc/abc.h" +#include "bool/dec/dec.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcRewrite.c b/src/base/abci/abcRewrite.c index a1e19405..9ce83e5f 100644 --- a/src/base/abci/abcRewrite.c +++ b/src/base/abci/abcRewrite.c @@ -18,9 +18,9 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/opt/rwr/rwr.h" -#include "src/bool/dec/dec.h" +#include "base/abc/abc.h" +#include "opt/rwr/rwr.h" +#include "bool/dec/dec.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcRr.c b/src/base/abci/abcRr.c index 83b7e85e..86bc40ed 100644 --- a/src/base/abci/abcRr.c +++ b/src/base/abci/abcRr.c @@ -18,9 +18,9 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/proof/fraig/fraig.h" -#include "src/opt/sim/sim.h" +#include "base/abc/abc.h" +#include "proof/fraig/fraig.h" +#include "opt/sim/sim.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcSat.c b/src/base/abci/abcSat.c index a10be364..c9987d70 100644 --- a/src/base/abci/abcSat.c +++ b/src/base/abci/abcSat.c @@ -18,11 +18,11 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/base/main/main.h" -#include "src/base/cmd/cmd.h" -#include "src/sat/bsat/satSolver.h" -#include "src/misc/extra/extraBdd.h" +#include "base/abc/abc.h" +#include "base/main/main.h" +#include "base/cmd/cmd.h" +#include "sat/bsat/satSolver.h" +#include "misc/extra/extraBdd.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcScorr.c b/src/base/abci/abcScorr.c index 60199b33..f224a0fd 100644 --- a/src/base/abci/abcScorr.c +++ b/src/base/abci/abcScorr.c @@ -18,13 +18,13 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/base/io/ioAbc.h" -#include "src/aig/saig/saig.h" -#include "src/proof/ssw/ssw.h" -#include "src/aig/gia/gia.h" -#include "src/proof/cec/cec.h" -#include "src/aig/gia/giaAig.h" +#include "base/abc/abc.h" +#include "base/io/ioAbc.h" +#include "aig/saig/saig.h" +#include "proof/ssw/ssw.h" +#include "aig/gia/gia.h" +#include "proof/cec/cec.h" +#include "aig/gia/giaAig.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcSense.c b/src/base/abci/abcSense.c index 3bcbc205..790793d9 100644 --- a/src/base/abci/abcSense.c +++ b/src/base/abci/abcSense.c @@ -18,8 +18,8 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/proof/fraig/fraig.h" +#include "base/abc/abc.h" +#include "proof/fraig/fraig.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcSpeedup.c b/src/base/abci/abcSpeedup.c index 2c3ebca0..320f6aa5 100644 --- a/src/base/abci/abcSpeedup.c +++ b/src/base/abci/abcSpeedup.c @@ -18,10 +18,10 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/base/main/main.h" -#include "src/map/if/if.h" -#include "src/aig/aig/aig.h" +#include "base/abc/abc.h" +#include "base/main/main.h" +#include "map/if/if.h" +#include "aig/aig/aig.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcStrash.c b/src/base/abci/abcStrash.c index 5bb93ada..b53a27e4 100644 --- a/src/base/abci/abcStrash.c +++ b/src/base/abci/abcStrash.c @@ -18,8 +18,8 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/bool/dec/dec.h" +#include "base/abc/abc.h" +#include "bool/dec/dec.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcSweep.c b/src/base/abci/abcSweep.c index 453dd9ba..4b53f7e1 100644 --- a/src/base/abci/abcSweep.c +++ b/src/base/abci/abcSweep.c @@ -18,10 +18,10 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/base/main/main.h" -#include "src/proof/fraig/fraig.h" -#include "src/misc/extra/extraBdd.h" +#include "base/abc/abc.h" +#include "base/main/main.h" +#include "proof/fraig/fraig.h" +#include "misc/extra/extraBdd.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcSymm.c b/src/base/abci/abcSymm.c index 29927563..bf6a987b 100644 --- a/src/base/abci/abcSymm.c +++ b/src/base/abci/abcSymm.c @@ -18,9 +18,9 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/opt/sim/sim.h" -#include "src/misc/extra/extraBdd.h" +#include "base/abc/abc.h" +#include "opt/sim/sim.h" +#include "misc/extra/extraBdd.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcTiming.c b/src/base/abci/abcTiming.c index f0cccdca..87c0e2b3 100644 --- a/src/base/abci/abcTiming.c +++ b/src/base/abci/abcTiming.c @@ -18,9 +18,9 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/base/main/main.h" -#include "src/map/mio/mio.h" +#include "base/abc/abc.h" +#include "base/main/main.h" +#include "map/mio/mio.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcUnate.c b/src/base/abci/abcUnate.c index 870b462b..1bd05cd6 100644 --- a/src/base/abci/abcUnate.c +++ b/src/base/abci/abcUnate.c @@ -18,8 +18,8 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/misc/extra/extraBdd.h" +#include "base/abc/abc.h" +#include "misc/extra/extraBdd.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcUnreach.c b/src/base/abci/abcUnreach.c index 72514029..2a203c96 100644 --- a/src/base/abci/abcUnreach.c +++ b/src/base/abci/abcUnreach.c @@ -18,8 +18,8 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/misc/extra/extraBdd.h" +#include "base/abc/abc.h" +#include "misc/extra/extraBdd.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcVerify.c b/src/base/abci/abcVerify.c index 9b88cb8a..8367d23c 100644 --- a/src/base/abci/abcVerify.c +++ b/src/base/abci/abcVerify.c @@ -18,15 +18,15 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/base/main/main.h" -#include "src/base/cmd/cmd.h" -#include "src/proof/fraig/fraig.h" -#include "src/opt/sim/sim.h" -#include "src/aig/aig/aig.h" -#include "src/aig/saig/saig.h" -#include "src/aig/gia/gia.h" -#include "src/proof/ssw/ssw.h" +#include "base/abc/abc.h" +#include "base/main/main.h" +#include "base/cmd/cmd.h" +#include "proof/fraig/fraig.h" +#include "opt/sim/sim.h" +#include "aig/aig/aig.h" +#include "aig/saig/saig.h" +#include "aig/gia/gia.h" +#include "proof/ssw/ssw.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/abci/abcXsim.c b/src/base/abci/abcXsim.c index 23bbbe1a..33f8544d 100644 --- a/src/base/abci/abcXsim.c +++ b/src/base/abci/abcXsim.c @@ -18,8 +18,8 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/aig/gia/gia.h" +#include "base/abc/abc.h" +#include "aig/gia/gia.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/cmd/cmd.c b/src/base/cmd/cmd.c index 6c8a3c2e..320f194f 100644 --- a/src/base/cmd/cmd.c +++ b/src/base/cmd/cmd.c @@ -24,10 +24,10 @@ #include #endif -#include "src/base/abc/abc.h" -#include "src/base/main/mainInt.h" +#include "base/abc/abc.h" +#include "base/main/mainInt.h" #include "cmdInt.h" -#include "src/misc/util/utilSignal.h" +#include "misc/util/utilSignal.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/cmd/cmdAlias.c b/src/base/cmd/cmdAlias.c index 67cdc318..5afef7c8 100644 --- a/src/base/cmd/cmdAlias.c +++ b/src/base/cmd/cmdAlias.c @@ -18,7 +18,7 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" +#include "base/abc/abc.h" #include "cmdInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/cmd/cmdApi.c b/src/base/cmd/cmdApi.c index 9357a93c..6ae9342d 100644 --- a/src/base/cmd/cmdApi.c +++ b/src/base/cmd/cmdApi.c @@ -18,8 +18,8 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/base/main/mainInt.h" +#include "base/abc/abc.h" +#include "base/main/mainInt.h" #include "cmdInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/cmd/cmdFlag.c b/src/base/cmd/cmdFlag.c index 7b46e8fc..f0ed38a1 100644 --- a/src/base/cmd/cmdFlag.c +++ b/src/base/cmd/cmdFlag.c @@ -18,8 +18,8 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/base/main/mainInt.h" +#include "base/abc/abc.h" +#include "base/main/mainInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/cmd/cmdHist.c b/src/base/cmd/cmdHist.c index b6a4d535..ba467f76 100644 --- a/src/base/cmd/cmdHist.c +++ b/src/base/cmd/cmdHist.c @@ -18,8 +18,8 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/base/main/mainInt.h" +#include "base/abc/abc.h" +#include "base/main/mainInt.h" #include "cmd.h" #include "cmdInt.h" diff --git a/src/base/cmd/cmdInt.h b/src/base/cmd/cmdInt.h index 6c1add92..149c26f1 100644 --- a/src/base/cmd/cmdInt.h +++ b/src/base/cmd/cmdInt.h @@ -26,7 +26,7 @@ /// INCLUDES /// //////////////////////////////////////////////////////////////////////// -#include "src/base/main/mainInt.h" +#include "base/main/mainInt.h" #include "cmd.h" ABC_NAMESPACE_HEADER_START diff --git a/src/base/cmd/cmdLoad.c b/src/base/cmd/cmdLoad.c index e4d8269a..7f7c1b60 100644 --- a/src/base/cmd/cmdLoad.c +++ b/src/base/cmd/cmdLoad.c @@ -18,11 +18,11 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/base/main/mainInt.h" +#include "base/abc/abc.h" +#include "base/main/mainInt.h" #include "cmd.h" #include "cmdInt.h" -#include "src/misc/util/utilSignal.h" +#include "misc/util/utilSignal.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/cmd/cmdPlugin.c b/src/base/cmd/cmdPlugin.c index e6b36f2a..429c2f72 100644 --- a/src/base/cmd/cmdPlugin.c +++ b/src/base/cmd/cmdPlugin.c @@ -25,11 +25,11 @@ #include #endif -#include "src/base/abc/abc.h" -#include "src/base/main/mainInt.h" +#include "base/abc/abc.h" +#include "base/main/mainInt.h" #include "cmd.h" #include "cmdInt.h" -#include "src/misc/util/utilSignal.h" +#include "misc/util/utilSignal.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/cmd/cmdUtils.c b/src/base/cmd/cmdUtils.c index 0e62edac..10a97910 100644 --- a/src/base/cmd/cmdUtils.c +++ b/src/base/cmd/cmdUtils.c @@ -18,8 +18,8 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/base/main/mainInt.h" +#include "base/abc/abc.h" +#include "base/main/mainInt.h" #include "cmdInt.h" #include diff --git a/src/base/io/io.c b/src/base/io/io.c index 27e41540..55965642 100644 --- a/src/base/io/io.c +++ b/src/base/io/io.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "ioAbc.h" -#include "src/base/main/mainInt.h" -#include "src/aig/saig/saig.h" +#include "base/main/mainInt.h" +#include "aig/saig/saig.h" ABC_NAMESPACE_IMPL_START @@ -2023,7 +2023,7 @@ usage: ABC_NAMESPACE_IMPL_END -#include "src/proof/fra/fra.h" +#include "proof/fra/fra.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/io/ioAbc.h b/src/base/io/ioAbc.h index 14d688f0..a5f56bfb 100644 --- a/src/base/io/ioAbc.h +++ b/src/base/io/ioAbc.h @@ -26,8 +26,8 @@ /// INCLUDES /// //////////////////////////////////////////////////////////////////////// -#include "src/base/abc/abc.h" -#include "src/misc/extra/extra.h" +#include "base/abc/abc.h" +#include "misc/extra/extra.h" //////////////////////////////////////////////////////////////////////// /// PARAMETERS /// diff --git a/src/base/io/ioReadAiger.c b/src/base/io/ioReadAiger.c index 8ff32ac9..c063f337 100644 --- a/src/base/io/ioReadAiger.c +++ b/src/base/io/ioReadAiger.c @@ -26,8 +26,8 @@ #include #include -#include "src/misc/bzlib/bzlib.h" -#include "src/misc/zlib/zlib.h" +#include "misc/bzlib/bzlib.h" +#include "misc/zlib/zlib.h" #include "ioAbc.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/io/ioReadBblif.c b/src/base/io/ioReadBblif.c index ee7c5ee7..b3a34cc1 100644 --- a/src/base/io/ioReadBblif.c +++ b/src/base/io/ioReadBblif.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "ioAbc.h" -#include "src/bool/dec/dec.h" -#include "src/misc/bbl/bblif.h" +#include "bool/dec/dec.h" +#include "misc/bbl/bblif.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/io/ioReadBlif.c b/src/base/io/ioReadBlif.c index b97cc1e7..592bee4a 100644 --- a/src/base/io/ioReadBlif.c +++ b/src/base/io/ioReadBlif.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "ioAbc.h" -#include "src/base/main/main.h" -#include "src/map/mio/mio.h" +#include "base/main/main.h" +#include "map/mio/mio.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/io/ioReadBlifAig.c b/src/base/io/ioReadBlifAig.c index 4bdb035e..ed4e4643 100644 --- a/src/base/io/ioReadBlifAig.c +++ b/src/base/io/ioReadBlifAig.c @@ -18,8 +18,8 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/misc/vec/vecPtr.h" +#include "base/abc/abc.h" +#include "misc/vec/vecPtr.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/io/ioReadBlifMv.c b/src/base/io/ioReadBlifMv.c index 127c4537..32fa5a68 100644 --- a/src/base/io/ioReadBlifMv.c +++ b/src/base/io/ioReadBlifMv.c @@ -18,8 +18,8 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/misc/vec/vecPtr.h" +#include "base/abc/abc.h" +#include "misc/vec/vecPtr.h" #include "ioAbc.h" ABC_NAMESPACE_IMPL_START @@ -2029,8 +2029,8 @@ Io_MvVar_t * Abc_NtkMvVarDup( Abc_Ntk_t * pNtk, Io_MvVar_t * pVar ) ABC_NAMESPACE_IMPL_END -#include "src/map/mio/mio.h" -#include "src/base/main/main.h" +#include "map/mio/mio.h" +#include "base/main/main.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/io/ioReadVerilog.c b/src/base/io/ioReadVerilog.c index da74d8d9..92083580 100644 --- a/src/base/io/ioReadVerilog.c +++ b/src/base/io/ioReadVerilog.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "ioAbc.h" -#include "src/base/ver/ver.h" +#include "base/ver/ver.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/io/ioUtil.c b/src/base/io/ioUtil.c index dbaa9138..86291710 100644 --- a/src/base/io/ioUtil.c +++ b/src/base/io/ioUtil.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "ioAbc.h" -#include "src/base/main/main.h" +#include "base/main/main.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/io/ioWriteAiger.c b/src/base/io/ioWriteAiger.c index ef2be673..20150839 100644 --- a/src/base/io/ioWriteAiger.c +++ b/src/base/io/ioWriteAiger.c @@ -26,8 +26,8 @@ #include #include -#include "src/misc/bzlib/bzlib.h" -#include "src/misc/zlib/zlib.h" +#include "misc/bzlib/bzlib.h" +#include "misc/zlib/zlib.h" #include "ioAbc.h" @@ -784,8 +784,8 @@ void Io_WriteAiger( Abc_Ntk_t * pNtk, char * pFileName, int fWriteSymbols, int f } -#include "src/aig/gia/giaAig.h" -#include "src/aig/saig/saig.h" +#include "aig/gia/giaAig.h" +#include "aig/saig/saig.h" /**Function************************************************************* diff --git a/src/base/io/ioWriteBblif.c b/src/base/io/ioWriteBblif.c index 09bb1da9..9e74b94e 100644 --- a/src/base/io/ioWriteBblif.c +++ b/src/base/io/ioWriteBblif.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "ioAbc.h" -#include "src/misc/bbl/bblif.h" +#include "misc/bbl/bblif.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/io/ioWriteBlif.c b/src/base/io/ioWriteBlif.c index eff37870..54be8434 100644 --- a/src/base/io/ioWriteBlif.c +++ b/src/base/io/ioWriteBlif.c @@ -19,10 +19,10 @@ ***********************************************************************/ #include "ioAbc.h" -#include "src/base/main/main.h" -#include "src/map/mio/mio.h" -#include "src/bool/kit/kit.h" -#include "src/map/if/if.h" +#include "base/main/main.h" +#include "map/mio/mio.h" +#include "bool/kit/kit.h" +#include "map/if/if.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/io/ioWriteBlifMv.c b/src/base/io/ioWriteBlifMv.c index fd054d5f..5d4ea46d 100644 --- a/src/base/io/ioWriteBlifMv.c +++ b/src/base/io/ioWriteBlifMv.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "ioAbc.h" -#include "src/base/main/main.h" -#include "src/map/mio/mio.h" +#include "base/main/main.h" +#include "map/mio/mio.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/io/ioWriteBook.c b/src/base/io/ioWriteBook.c index ae717c8d..92f49d62 100644 --- a/src/base/io/ioWriteBook.c +++ b/src/base/io/ioWriteBook.c @@ -20,8 +20,8 @@ #include -#include "src/base/main/main.h" -#include "src/map/mio/mio.h" +#include "base/main/main.h" +#include "map/mio/mio.h" #include "ioAbc.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/io/ioWriteCnf.c b/src/base/io/ioWriteCnf.c index d5d377cc..19978060 100644 --- a/src/base/io/ioWriteCnf.c +++ b/src/base/io/ioWriteCnf.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "ioAbc.h" -#include "src/sat/bsat/satSolver.h" +#include "sat/bsat/satSolver.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/io/ioWriteDot.c b/src/base/io/ioWriteDot.c index 9a9bcd82..1110e70e 100644 --- a/src/base/io/ioWriteDot.c +++ b/src/base/io/ioWriteDot.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "ioAbc.h" -#include "src/base/main/main.h" -#include "src/map/mio/mio.h" +#include "base/main/main.h" +#include "map/mio/mio.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/io/ioWriteVerilog.c b/src/base/io/ioWriteVerilog.c index 511eb9f0..ae233879 100644 --- a/src/base/io/ioWriteVerilog.c +++ b/src/base/io/ioWriteVerilog.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "ioAbc.h" -#include "src/base/main/main.h" -#include "src/map/mio/mio.h" +#include "base/main/main.h" +#include "map/mio/mio.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/main/libSupport.c b/src/base/main/libSupport.c index dfcc0988..4d762413 100644 --- a/src/base/main/libSupport.c +++ b/src/base/main/libSupport.c @@ -21,7 +21,7 @@ #include #include -#include "src/base/abc/abc.h" +#include "base/abc/abc.h" #include "mainInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/main/main.c b/src/base/main/main.c index 9194e9f1..b7d1c0a8 100644 --- a/src/base/main/main.c +++ b/src/base/main/main.c @@ -49,7 +49,7 @@ SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. #include #endif /* ABC_PYTHON_EMBED */ -#include "src/base/abc/abc.h" +#include "base/abc/abc.h" #include "mainInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/main/main.h b/src/base/main/main.h index c1abc54f..620ddac6 100644 --- a/src/base/main/main.h +++ b/src/base/main/main.h @@ -27,20 +27,20 @@ //////////////////////////////////////////////////////////////////////// // core packages -#include "src/base/abc/abc.h" -#include "src/aig/gia/gia.h" +#include "base/abc/abc.h" +#include "aig/gia/gia.h" // data structure packages -#include "src/misc/vec/vec.h" -#include "src/misc/st/st.h" +#include "misc/vec/vec.h" +#include "misc/st/st.h" ABC_NAMESPACE_HEADER_START // the framework containing all data typedef struct Abc_Frame_t_ Abc_Frame_t; ABC_NAMESPACE_HEADER_END -#include "src/base/cmd/cmd.h" -#include "src/base/io/ioAbc.h" +#include "base/cmd/cmd.h" +#include "base/io/ioAbc.h" ABC_NAMESPACE_HEADER_START diff --git a/src/base/main/mainFrame.c b/src/base/main/mainFrame.c index 296bf7c2..269a4f8f 100644 --- a/src/base/main/mainFrame.c +++ b/src/base/main/mainFrame.c @@ -18,10 +18,10 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" +#include "base/abc/abc.h" #include "mainInt.h" -#include "src/bool/dec/dec.h" -#include "src/misc/extra/extraBdd.h" +#include "bool/dec/dec.h" +#include "misc/extra/extraBdd.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/main/mainInit.c b/src/base/main/mainInit.c index 75d52570..5061fa0d 100644 --- a/src/base/main/mainInit.c +++ b/src/base/main/mainInit.c @@ -18,7 +18,7 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" +#include "base/abc/abc.h" #include "mainInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/main/mainInt.h b/src/base/main/mainInt.h index aef02ba9..6ed12786 100644 --- a/src/base/main/mainInt.h +++ b/src/base/main/mainInt.h @@ -27,16 +27,16 @@ //////////////////////////////////////////////////////////////////////// #include "main.h" -#include "src/misc/tim/tim.h" -#include "src/map/if/if.h" -#include "src/aig/aig/aig.h" -#include "src/aig/gia/gia.h" -#include "src/proof/ssw/ssw.h" -#include "src/proof/fra/fra.h" -//#include "src/aig/nwk/nwkMerge.h" -//#include "src/aig/ntl/ntlnwk.h" -#include "src/misc/ext/ext.h" -#include "src/misc/extra/extraBdd.h" +#include "misc/tim/tim.h" +#include "map/if/if.h" +#include "aig/aig/aig.h" +#include "aig/gia/gia.h" +#include "proof/ssw/ssw.h" +#include "proof/fra/fra.h" +//#include "aig/nwk/nwkMerge.h" +//#include "aig/ntl/ntlnwk.h" +#include "misc/ext/ext.h" +#include "misc/extra/extraBdd.h" ABC_NAMESPACE_HEADER_START diff --git a/src/base/main/mainLib.c b/src/base/main/mainLib.c index 83bae04f..5af63d79 100644 --- a/src/base/main/mainLib.c +++ b/src/base/main/mainLib.c @@ -18,7 +18,7 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" +#include "base/abc/abc.h" #include "mainInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/main/mainUtils.c b/src/base/main/mainUtils.c index 5b6dc893..f0d602d3 100644 --- a/src/base/main/mainUtils.c +++ b/src/base/main/mainUtils.c @@ -18,7 +18,7 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" +#include "base/abc/abc.h" #include "mainInt.h" #ifndef _WIN32 diff --git a/src/base/test/test.c b/src/base/test/test.c index 92094d9a..d9bddef5 100644 --- a/src/base/test/test.c +++ b/src/base/test/test.c @@ -18,7 +18,7 @@ ***********************************************************************/ -#include "src/base/main/main.h" +#include "base/main/main.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/ver/ver.h b/src/base/ver/ver.h index 8c9d6e00..48199a2e 100644 --- a/src/base/ver/ver.h +++ b/src/base/ver/ver.h @@ -27,7 +27,7 @@ //////////////////////////////////////////////////////////////////////// #include -#include "src/base/abc/abc.h" +#include "base/abc/abc.h" //////////////////////////////////////////////////////////////////////// /// PARAMETERS /// diff --git a/src/base/ver/verCore.c b/src/base/ver/verCore.c index 4c40346c..4e131c85 100644 --- a/src/base/ver/verCore.c +++ b/src/base/ver/verCore.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "ver.h" -#include "src/map/mio/mio.h" -#include "src/base/main/main.h" +#include "map/mio/mio.h" +#include "base/main/main.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cas/casCore.c b/src/bdd/cas/casCore.c index 66d11082..941784fd 100644 --- a/src/bdd/cas/casCore.c +++ b/src/bdd/cas/casCore.c @@ -22,9 +22,9 @@ #include #include -#include "src/base/main/main.h" -#include "src/base/cmd/cmd.h" -#include "src/misc/extra/extraBdd.h" +#include "base/main/main.h" +#include "base/cmd/cmd.h" +#include "misc/extra/extraBdd.h" #include "cas.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cas/casDec.c b/src/bdd/cas/casDec.c index 794f6fd3..cfcc9f2a 100644 --- a/src/bdd/cas/casDec.c +++ b/src/bdd/cas/casDec.c @@ -22,7 +22,7 @@ #include #include -#include "src/misc/extra/extraBdd.h" +#include "misc/extra/extraBdd.h" #include "cas.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cudd.h b/src/bdd/cudd/cudd.h index fb1d6d58..07762456 100644 --- a/src/bdd/cudd/cudd.h +++ b/src/bdd/cudd/cudd.h @@ -62,8 +62,8 @@ /* Nested includes */ /*---------------------------------------------------------------------------*/ -#include "src/bdd/mtr/mtr.h" -#include "src/bdd/epd/epd.h" +#include "bdd/mtr/mtr.h" +#include "bdd/epd/epd.h" ABC_NAMESPACE_HEADER_START diff --git a/src/bdd/cudd/cuddAPI.c b/src/bdd/cudd/cuddAPI.c index 800e01c1..15520273 100644 --- a/src/bdd/cudd/cuddAPI.c +++ b/src/bdd/cudd/cuddAPI.c @@ -191,7 +191,7 @@ ******************************************************************************/ -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddAddAbs.c b/src/bdd/cudd/cuddAddAbs.c index 44c77d94..81e08253 100644 --- a/src/bdd/cudd/cuddAddAbs.c +++ b/src/bdd/cudd/cuddAddAbs.c @@ -59,7 +59,7 @@ ******************************************************************************/ -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddAddApply.c b/src/bdd/cudd/cuddAddApply.c index ec77229c..86737f42 100644 --- a/src/bdd/cudd/cuddAddApply.c +++ b/src/bdd/cudd/cuddAddApply.c @@ -69,7 +69,7 @@ ******************************************************************************/ -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddAddFind.c b/src/bdd/cudd/cuddAddFind.c index 57343b1a..c9cebeaf 100644 --- a/src/bdd/cudd/cuddAddFind.c +++ b/src/bdd/cudd/cuddAddFind.c @@ -54,7 +54,7 @@ ******************************************************************************/ -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddAddInv.c b/src/bdd/cudd/cuddAddInv.c index e15da46e..14fcd3e1 100644 --- a/src/bdd/cudd/cuddAddInv.c +++ b/src/bdd/cudd/cuddAddInv.c @@ -51,7 +51,7 @@ ******************************************************************************/ -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddAddIte.c b/src/bdd/cudd/cuddAddIte.c index 29307756..574159c6 100644 --- a/src/bdd/cudd/cuddAddIte.c +++ b/src/bdd/cudd/cuddAddIte.c @@ -60,7 +60,7 @@ ******************************************************************************/ -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddAddNeg.c b/src/bdd/cudd/cuddAddNeg.c index 192ea513..ab36874d 100644 --- a/src/bdd/cudd/cuddAddNeg.c +++ b/src/bdd/cudd/cuddAddNeg.c @@ -53,7 +53,7 @@ ******************************************************************************/ -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddAddWalsh.c b/src/bdd/cudd/cuddAddWalsh.c index 0ad53418..e49490e2 100644 --- a/src/bdd/cudd/cuddAddWalsh.c +++ b/src/bdd/cudd/cuddAddWalsh.c @@ -53,7 +53,7 @@ ******************************************************************************/ -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddAndAbs.c b/src/bdd/cudd/cuddAndAbs.c index 0db3e4e4..8e1fd161 100644 --- a/src/bdd/cudd/cuddAndAbs.c +++ b/src/bdd/cudd/cuddAndAbs.c @@ -52,7 +52,7 @@ ******************************************************************************/ -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddAnneal.c b/src/bdd/cudd/cuddAnneal.c index 943265cc..526aa17a 100644 --- a/src/bdd/cudd/cuddAnneal.c +++ b/src/bdd/cudd/cuddAnneal.c @@ -62,7 +62,7 @@ ******************************************************************************/ -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddApa.c b/src/bdd/cudd/cuddApa.c index 8515ee0a..91dd1a2f 100644 --- a/src/bdd/cudd/cuddApa.c +++ b/src/bdd/cudd/cuddApa.c @@ -70,7 +70,7 @@ ******************************************************************************/ -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddApprox.c b/src/bdd/cudd/cuddApprox.c index 203c438d..5df43364 100644 --- a/src/bdd/cudd/cuddApprox.c +++ b/src/bdd/cudd/cuddApprox.c @@ -78,7 +78,7 @@ #else #define DBL_MAX_EXP 1024 #endif -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddBddAbs.c b/src/bdd/cudd/cuddBddAbs.c index 7dc3ef56..bfdd08ba 100644 --- a/src/bdd/cudd/cuddBddAbs.c +++ b/src/bdd/cudd/cuddBddAbs.c @@ -62,7 +62,7 @@ ******************************************************************************/ -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddBddCorr.c b/src/bdd/cudd/cuddBddCorr.c index 4606ea48..4d2c22d6 100644 --- a/src/bdd/cudd/cuddBddCorr.c +++ b/src/bdd/cudd/cuddBddCorr.c @@ -57,7 +57,7 @@ ******************************************************************************/ -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddBddIte.c b/src/bdd/cudd/cuddBddIte.c index 43dbcd60..0d28ce96 100644 --- a/src/bdd/cudd/cuddBddIte.c +++ b/src/bdd/cudd/cuddBddIte.c @@ -72,7 +72,7 @@ ******************************************************************************/ -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddBridge.c b/src/bdd/cudd/cuddBridge.c index cedf920b..07db26d0 100644 --- a/src/bdd/cudd/cuddBridge.c +++ b/src/bdd/cudd/cuddBridge.c @@ -71,7 +71,7 @@ ******************************************************************************/ -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddCache.c b/src/bdd/cudd/cuddCache.c index 31545bd6..68349942 100644 --- a/src/bdd/cudd/cuddCache.c +++ b/src/bdd/cudd/cuddCache.c @@ -63,7 +63,7 @@ ******************************************************************************/ -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddCheck.c b/src/bdd/cudd/cuddCheck.c index c4b9b5c2..fef85a67 100644 --- a/src/bdd/cudd/cuddCheck.c +++ b/src/bdd/cudd/cuddCheck.c @@ -61,7 +61,7 @@ ******************************************************************************/ -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddClip.c b/src/bdd/cudd/cuddClip.c index 6d4216a9..9e3572f9 100644 --- a/src/bdd/cudd/cuddClip.c +++ b/src/bdd/cudd/cuddClip.c @@ -60,7 +60,7 @@ ******************************************************************************/ -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddCof.c b/src/bdd/cudd/cuddCof.c index f2d3c118..cec56a62 100644 --- a/src/bdd/cudd/cuddCof.c +++ b/src/bdd/cudd/cuddCof.c @@ -56,7 +56,7 @@ ******************************************************************************/ -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddCompose.c b/src/bdd/cudd/cuddCompose.c index d88491b0..f3aff14b 100644 --- a/src/bdd/cudd/cuddCompose.c +++ b/src/bdd/cudd/cuddCompose.c @@ -82,7 +82,7 @@ ******************************************************************************/ -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddDecomp.c b/src/bdd/cudd/cuddDecomp.c index ff31e04c..0f5714d1 100644 --- a/src/bdd/cudd/cuddDecomp.c +++ b/src/bdd/cudd/cuddDecomp.c @@ -61,7 +61,7 @@ ******************************************************************************/ -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddEssent.c b/src/bdd/cudd/cuddEssent.c index dfd5bd9d..f2baf37f 100644 --- a/src/bdd/cudd/cuddEssent.c +++ b/src/bdd/cudd/cuddEssent.c @@ -71,7 +71,7 @@ ******************************************************************************/ -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddExact.c b/src/bdd/cudd/cuddExact.c index 54560a44..80c41557 100644 --- a/src/bdd/cudd/cuddExact.c +++ b/src/bdd/cudd/cuddExact.c @@ -67,7 +67,7 @@ ******************************************************************************/ -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddExport.c b/src/bdd/cudd/cuddExport.c index 2f19e504..241c63ec 100644 --- a/src/bdd/cudd/cuddExport.c +++ b/src/bdd/cudd/cuddExport.c @@ -62,7 +62,7 @@ ******************************************************************************/ -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddGenCof.c b/src/bdd/cudd/cuddGenCof.c index f5597f3d..119b07df 100644 --- a/src/bdd/cudd/cuddGenCof.c +++ b/src/bdd/cudd/cuddGenCof.c @@ -75,7 +75,7 @@ ******************************************************************************/ -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddGenetic.c b/src/bdd/cudd/cuddGenetic.c index 8c65875e..3cdbfe7c 100644 --- a/src/bdd/cudd/cuddGenetic.c +++ b/src/bdd/cudd/cuddGenetic.c @@ -80,7 +80,7 @@ ******************************************************************************/ -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddGroup.c b/src/bdd/cudd/cuddGroup.c index 547810b2..731f8147 100644 --- a/src/bdd/cudd/cuddGroup.c +++ b/src/bdd/cudd/cuddGroup.c @@ -76,7 +76,7 @@ ******************************************************************************/ -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddHarwell.c b/src/bdd/cudd/cuddHarwell.c index 02018a11..a8c7d567 100644 --- a/src/bdd/cudd/cuddHarwell.c +++ b/src/bdd/cudd/cuddHarwell.c @@ -48,7 +48,7 @@ ******************************************************************************/ -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddInit.c b/src/bdd/cudd/cuddInit.c index c0dbaa0c..f23d9e6e 100644 --- a/src/bdd/cudd/cuddInit.c +++ b/src/bdd/cudd/cuddInit.c @@ -56,7 +56,7 @@ ******************************************************************************/ -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddInt.h b/src/bdd/cudd/cuddInt.h index 6e32acd2..737d211c 100644 --- a/src/bdd/cudd/cuddInt.h +++ b/src/bdd/cudd/cuddInt.h @@ -59,8 +59,8 @@ #ifdef DD_MIS #include "array.h" #include "list.h" -#include "src/misc/st/st.h" -#include "src/misc/espresso/espresso.h" +#include "misc/st/st.h" +#include "misc/espresso/espresso.h" #include "node.h" #ifdef SIS #include "graph.h" @@ -71,7 +71,7 @@ #include #include "cudd.h" -#include "src/misc/st/st.h" +#include "misc/st/st.h" ABC_NAMESPACE_HEADER_START diff --git a/src/bdd/cudd/cuddInteract.c b/src/bdd/cudd/cuddInteract.c index b0757d00..e4c1fe5a 100644 --- a/src/bdd/cudd/cuddInteract.c +++ b/src/bdd/cudd/cuddInteract.c @@ -74,7 +74,7 @@ ******************************************************************************/ -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddLCache.c b/src/bdd/cudd/cuddLCache.c index e08e0f00..f5bcfd66 100644 --- a/src/bdd/cudd/cuddLCache.c +++ b/src/bdd/cudd/cuddLCache.c @@ -72,7 +72,7 @@ ******************************************************************************/ -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddLevelQ.c b/src/bdd/cudd/cuddLevelQ.c index 987d39b4..5a88b772 100644 --- a/src/bdd/cudd/cuddLevelQ.c +++ b/src/bdd/cudd/cuddLevelQ.c @@ -77,7 +77,7 @@ ******************************************************************************/ -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddLinear.c b/src/bdd/cudd/cuddLinear.c index 38f75beb..0dd688f2 100644 --- a/src/bdd/cudd/cuddLinear.c +++ b/src/bdd/cudd/cuddLinear.c @@ -61,7 +61,7 @@ ******************************************************************************/ -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddLiteral.c b/src/bdd/cudd/cuddLiteral.c index bc7ac3a0..60e05648 100644 --- a/src/bdd/cudd/cuddLiteral.c +++ b/src/bdd/cudd/cuddLiteral.c @@ -52,7 +52,7 @@ ******************************************************************************/ -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddMatMult.c b/src/bdd/cudd/cuddMatMult.c index b3989e9e..e8cae2ce 100644 --- a/src/bdd/cudd/cuddMatMult.c +++ b/src/bdd/cudd/cuddMatMult.c @@ -56,7 +56,7 @@ ******************************************************************************/ -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddPriority.c b/src/bdd/cudd/cuddPriority.c index ab362dea..aae5a732 100644 --- a/src/bdd/cudd/cuddPriority.c +++ b/src/bdd/cudd/cuddPriority.c @@ -73,7 +73,7 @@ ******************************************************************************/ -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddRead.c b/src/bdd/cudd/cuddRead.c index 8cb555d2..9b0d8416 100644 --- a/src/bdd/cudd/cuddRead.c +++ b/src/bdd/cudd/cuddRead.c @@ -50,7 +50,7 @@ ******************************************************************************/ -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddRef.c b/src/bdd/cudd/cuddRef.c index 9592f4c2..f3e643e2 100644 --- a/src/bdd/cudd/cuddRef.c +++ b/src/bdd/cudd/cuddRef.c @@ -65,7 +65,7 @@ ******************************************************************************/ -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddReorder.c b/src/bdd/cudd/cuddReorder.c index b7d91dd9..662d32c0 100644 --- a/src/bdd/cudd/cuddReorder.c +++ b/src/bdd/cudd/cuddReorder.c @@ -72,7 +72,7 @@ ******************************************************************************/ -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddSat.c b/src/bdd/cudd/cuddSat.c index a01268e6..1e0126e9 100644 --- a/src/bdd/cudd/cuddSat.c +++ b/src/bdd/cudd/cuddSat.c @@ -69,7 +69,7 @@ ******************************************************************************/ -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddSign.c b/src/bdd/cudd/cuddSign.c index 5ece24ad..c3fcfa9d 100644 --- a/src/bdd/cudd/cuddSign.c +++ b/src/bdd/cudd/cuddSign.c @@ -52,7 +52,7 @@ ******************************************************************************/ -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddSolve.c b/src/bdd/cudd/cuddSolve.c index a1fb77ca..28f42f01 100644 --- a/src/bdd/cudd/cuddSolve.c +++ b/src/bdd/cudd/cuddSolve.c @@ -55,7 +55,7 @@ ******************************************************************************/ -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddSplit.c b/src/bdd/cudd/cuddSplit.c index d650ecbc..b2f6d793 100644 --- a/src/bdd/cudd/cuddSplit.c +++ b/src/bdd/cudd/cuddSplit.c @@ -59,7 +59,7 @@ ******************************************************************************/ -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddSubsetHB.c b/src/bdd/cudd/cuddSubsetHB.c index 21daf9ed..a9d677f4 100644 --- a/src/bdd/cudd/cuddSubsetHB.c +++ b/src/bdd/cudd/cuddSubsetHB.c @@ -73,7 +73,7 @@ #else #define DBL_MAX_EXP 1024 #endif -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddSubsetSP.c b/src/bdd/cudd/cuddSubsetSP.c index b5673d88..36848eec 100644 --- a/src/bdd/cudd/cuddSubsetSP.c +++ b/src/bdd/cudd/cuddSubsetSP.c @@ -68,7 +68,7 @@ ******************************************************************************/ -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddSymmetry.c b/src/bdd/cudd/cuddSymmetry.c index d2269a36..56f05e13 100644 --- a/src/bdd/cudd/cuddSymmetry.c +++ b/src/bdd/cudd/cuddSymmetry.c @@ -65,7 +65,7 @@ ******************************************************************************/ -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddTable.c b/src/bdd/cudd/cuddTable.c index a45a1efd..ae002b17 100644 --- a/src/bdd/cudd/cuddTable.c +++ b/src/bdd/cudd/cuddTable.c @@ -80,7 +80,7 @@ ******************************************************************************/ -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddUtil.c b/src/bdd/cudd/cuddUtil.c index 8a1f9b2c..f4848c4d 100644 --- a/src/bdd/cudd/cuddUtil.c +++ b/src/bdd/cudd/cuddUtil.c @@ -105,7 +105,7 @@ ******************************************************************************/ -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddWindow.c b/src/bdd/cudd/cuddWindow.c index d07f188f..7f887c7e 100644 --- a/src/bdd/cudd/cuddWindow.c +++ b/src/bdd/cudd/cuddWindow.c @@ -58,7 +58,7 @@ ******************************************************************************/ -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddZddCount.c b/src/bdd/cudd/cuddZddCount.c index c91ef92b..0667a08b 100644 --- a/src/bdd/cudd/cuddZddCount.c +++ b/src/bdd/cudd/cuddZddCount.c @@ -61,7 +61,7 @@ ******************************************************************************/ -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddZddFuncs.c b/src/bdd/cudd/cuddZddFuncs.c index f4bae0aa..e845af8a 100644 --- a/src/bdd/cudd/cuddZddFuncs.c +++ b/src/bdd/cudd/cuddZddFuncs.c @@ -75,7 +75,7 @@ ******************************************************************************/ -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddZddGroup.c b/src/bdd/cudd/cuddZddGroup.c index dfdf8bb3..f5972292 100644 --- a/src/bdd/cudd/cuddZddGroup.c +++ b/src/bdd/cudd/cuddZddGroup.c @@ -67,7 +67,7 @@ ******************************************************************************/ -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddZddIsop.c b/src/bdd/cudd/cuddZddIsop.c index a1e3b7b8..ace0807b 100644 --- a/src/bdd/cudd/cuddZddIsop.c +++ b/src/bdd/cudd/cuddZddIsop.c @@ -61,7 +61,7 @@ ******************************************************************************/ -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddZddLin.c b/src/bdd/cudd/cuddZddLin.c index 09777b2f..0e2e3c3a 100644 --- a/src/bdd/cudd/cuddZddLin.c +++ b/src/bdd/cudd/cuddZddLin.c @@ -59,7 +59,7 @@ ******************************************************************************/ -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddZddMisc.c b/src/bdd/cudd/cuddZddMisc.c index 14250322..05b3e92f 100644 --- a/src/bdd/cudd/cuddZddMisc.c +++ b/src/bdd/cudd/cuddZddMisc.c @@ -60,7 +60,7 @@ ******************************************************************************/ #include -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddZddPort.c b/src/bdd/cudd/cuddZddPort.c index fbca346e..1faee739 100644 --- a/src/bdd/cudd/cuddZddPort.c +++ b/src/bdd/cudd/cuddZddPort.c @@ -59,7 +59,7 @@ ******************************************************************************/ -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddZddReord.c b/src/bdd/cudd/cuddZddReord.c index 8a1d14cb..3a6ea8ed 100644 --- a/src/bdd/cudd/cuddZddReord.c +++ b/src/bdd/cudd/cuddZddReord.c @@ -73,7 +73,7 @@ ******************************************************************************/ -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddZddSetop.c b/src/bdd/cudd/cuddZddSetop.c index ec0c467c..3b8cdcc5 100644 --- a/src/bdd/cudd/cuddZddSetop.c +++ b/src/bdd/cudd/cuddZddSetop.c @@ -73,7 +73,7 @@ ******************************************************************************/ -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddZddSymm.c b/src/bdd/cudd/cuddZddSymm.c index f04772c9..90e71adc 100644 --- a/src/bdd/cudd/cuddZddSymm.c +++ b/src/bdd/cudd/cuddZddSymm.c @@ -67,7 +67,7 @@ ******************************************************************************/ -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddZddUtil.c b/src/bdd/cudd/cuddZddUtil.c index e87f5af8..a596c8ab 100644 --- a/src/bdd/cudd/cuddZddUtil.c +++ b/src/bdd/cudd/cuddZddUtil.c @@ -66,7 +66,7 @@ ******************************************************************************/ -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/dsd/dsdInt.h b/src/bdd/dsd/dsdInt.h index 11a8e82e..787f1747 100644 --- a/src/bdd/dsd/dsdInt.h +++ b/src/bdd/dsd/dsdInt.h @@ -20,7 +20,7 @@ #define ABC__bdd__dsd__dsdInt_h -#include "src/misc/extra/extraBdd.h" +#include "misc/extra/extraBdd.h" #include "dsd.h" ABC_NAMESPACE_HEADER_START diff --git a/src/bdd/epd/epd.c b/src/bdd/epd/epd.c index 6a803e16..d85effd6 100644 --- a/src/bdd/epd/epd.c +++ b/src/bdd/epd/epd.c @@ -52,7 +52,7 @@ #include #include #include -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "epd.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/mtr/mtrBasic.c b/src/bdd/mtr/mtrBasic.c index b710ef4a..1855dfe7 100644 --- a/src/bdd/mtr/mtrBasic.c +++ b/src/bdd/mtr/mtrBasic.c @@ -60,7 +60,7 @@ ******************************************************************************/ -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "mtrInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/mtr/mtrGroup.c b/src/bdd/mtr/mtrGroup.c index b29fe32d..e997d5eb 100644 --- a/src/bdd/mtr/mtrGroup.c +++ b/src/bdd/mtr/mtrGroup.c @@ -60,7 +60,7 @@ ******************************************************************************/ -#include "src/misc/util/util_hack.h" +#include "misc/util/util_hack.h" #include "mtrInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/parse/parseEqn.c b/src/bdd/parse/parseEqn.c index a0b9ada8..f6d8b220 100644 --- a/src/bdd/parse/parseEqn.c +++ b/src/bdd/parse/parseEqn.c @@ -22,8 +22,8 @@ //////////////////////////////////////////////////////////////////////// #include "parseInt.h" -#include "src/misc/vec/vec.h" -#include "src/aig/hop/hop.h" +#include "misc/vec/vec.h" +#include "aig/hop/hop.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/parse/parseInt.h b/src/bdd/parse/parseInt.h index 78766612..80ed945a 100644 --- a/src/bdd/parse/parseInt.h +++ b/src/bdd/parse/parseInt.h @@ -26,7 +26,7 @@ #include -#include "src/misc/extra/extraBdd.h" +#include "misc/extra/extraBdd.h" #include "parse.h" ABC_NAMESPACE_HEADER_START diff --git a/src/bdd/reo/reo.h b/src/bdd/reo/reo.h index 9381a350..981b56df 100644 --- a/src/bdd/reo/reo.h +++ b/src/bdd/reo/reo.h @@ -22,7 +22,7 @@ #include #include -#include "src/misc/extra/extraBdd.h" +#include "misc/extra/extraBdd.h" //////////////////////////////////////////////////////////////////////// /// MACRO DEFINITIONS /// diff --git a/src/bool/bdc/bdcInt.h b/src/bool/bdc/bdcInt.h index cca10957..da6cce5a 100644 --- a/src/bool/bdc/bdcInt.h +++ b/src/bool/bdc/bdcInt.h @@ -26,7 +26,7 @@ /// INCLUDES /// //////////////////////////////////////////////////////////////////////// -#include "src/bool/kit/kit.h" +#include "bool/kit/kit.h" #include "bdc.h" //////////////////////////////////////////////////////////////////////// diff --git a/src/bool/bdc/bdcSpfd.c b/src/bool/bdc/bdcSpfd.c index 1695cf2c..22efc8a9 100644 --- a/src/bool/bdc/bdcSpfd.c +++ b/src/bool/bdc/bdcSpfd.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "bdcInt.h" -#include "src/aig/aig/aig.h" +#include "aig/aig/aig.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bool/dec/decAbc.c b/src/bool/dec/decAbc.c index 65f69f9b..7f060cb6 100644 --- a/src/bool/dec/decAbc.c +++ b/src/bool/dec/decAbc.c @@ -16,8 +16,8 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/aig/ivy/ivy.h" +#include "base/abc/abc.h" +#include "aig/ivy/ivy.h" #include "dec.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bool/dec/decFactor.c b/src/bool/dec/decFactor.c index faed9e74..febaa905 100644 --- a/src/bool/dec/decFactor.c +++ b/src/bool/dec/decFactor.c @@ -16,10 +16,10 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/base/main/main.h" -#include "src/misc/mvc/mvc.h" -#include "src/misc/extra/extraBdd.h" +#include "base/abc/abc.h" +#include "base/main/main.h" +#include "misc/mvc/mvc.h" +#include "misc/extra/extraBdd.h" #include "dec.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bool/dec/decMan.c b/src/bool/dec/decMan.c index 13bc34e0..7de31a7e 100644 --- a/src/bool/dec/decMan.c +++ b/src/bool/dec/decMan.c @@ -16,8 +16,8 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/misc/mvc/mvc.h" +#include "base/abc/abc.h" +#include "misc/mvc/mvc.h" #include "dec.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bool/dec/decPrint.c b/src/bool/dec/decPrint.c index 208c7e8e..d6ea7f3b 100644 --- a/src/bool/dec/decPrint.c +++ b/src/bool/dec/decPrint.c @@ -16,7 +16,7 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" +#include "base/abc/abc.h" #include "dec.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bool/dec/decUtil.c b/src/bool/dec/decUtil.c index 0350b3e2..d64aa4fa 100644 --- a/src/bool/dec/decUtil.c +++ b/src/bool/dec/decUtil.c @@ -16,8 +16,8 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/misc/extra/extraBdd.h" +#include "base/abc/abc.h" +#include "misc/extra/extraBdd.h" #include "dec.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bool/kit/cloud.h b/src/bool/kit/cloud.h index e2d451ae..a5db0e68 100644 --- a/src/bool/kit/cloud.h +++ b/src/bool/kit/cloud.h @@ -24,7 +24,7 @@ #include #include -#include "src/misc/util/abc_global.h" +#include "misc/util/abc_global.h" diff --git a/src/bool/kit/kit.h b/src/bool/kit/kit.h index 990fa54a..dfee532e 100644 --- a/src/bool/kit/kit.h +++ b/src/bool/kit/kit.h @@ -31,8 +31,8 @@ #include #include -#include "src/misc/vec/vec.h" -#include "src/misc/extra/extraBdd.h" +#include "misc/vec/vec.h" +#include "misc/extra/extraBdd.h" #include "cloud.h" //////////////////////////////////////////////////////////////////////// diff --git a/src/bool/kit/kitAig.c b/src/bool/kit/kitAig.c index 95fccbad..7db335f6 100644 --- a/src/bool/kit/kitAig.c +++ b/src/bool/kit/kitAig.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "kit.h" -#include "src/aig/aig/aig.h" +#include "aig/aig/aig.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bool/kit/kitBdd.c b/src/bool/kit/kitBdd.c index 0d12d0dc..9b6cb09f 100644 --- a/src/bool/kit/kitBdd.c +++ b/src/bool/kit/kitBdd.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "kit.h" -#include "src/misc/extra/extraBdd.h" +#include "misc/extra/extraBdd.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bool/kit/kitHop.c b/src/bool/kit/kitHop.c index 28f4e714..c7c855af 100644 --- a/src/bool/kit/kitHop.c +++ b/src/bool/kit/kitHop.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "kit.h" -#include "src/aig/hop/hop.h" +#include "aig/hop/hop.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bool/kit/kitPla.c b/src/bool/kit/kitPla.c index acc163fc..bec2d5f3 100644 --- a/src/bool/kit/kitPla.c +++ b/src/bool/kit/kitPla.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "kit.h" -#include "src/aig/aig/aig.h" +#include "aig/aig/aig.h" ABC_NAMESPACE_IMPL_START diff --git a/src/map/amap/amapCore.c b/src/map/amap/amapCore.c index 507dcc5e..c4ae817a 100644 --- a/src/map/amap/amapCore.c +++ b/src/map/amap/amapCore.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "amapInt.h" -#include "src/base/main/main.h" +#include "base/main/main.h" ABC_NAMESPACE_IMPL_START diff --git a/src/map/amap/amapInt.h b/src/map/amap/amapInt.h index 86e3e18f..a9a593c0 100644 --- a/src/map/amap/amapInt.h +++ b/src/map/amap/amapInt.h @@ -26,7 +26,7 @@ /// INCLUDES /// //////////////////////////////////////////////////////////////////////// -#include "src/aig/aig/aig.h" +#include "aig/aig/aig.h" #include "amap.h" //////////////////////////////////////////////////////////////////////// diff --git a/src/map/amap/amapParse.c b/src/map/amap/amapParse.c index 2242fa7a..d81411bc 100644 --- a/src/map/amap/amapParse.c +++ b/src/map/amap/amapParse.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "amapInt.h" -#include "src/aig/hop/hop.h" -#include "src/bool/kit/kit.h" +#include "aig/hop/hop.h" +#include "bool/kit/kit.h" ABC_NAMESPACE_IMPL_START diff --git a/src/map/amap/amapPerm.c b/src/map/amap/amapPerm.c index 1ba91890..9a3cf4a8 100644 --- a/src/map/amap/amapPerm.c +++ b/src/map/amap/amapPerm.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "amapInt.h" -#include "src/bool/kit/kit.h" +#include "bool/kit/kit.h" ABC_NAMESPACE_IMPL_START diff --git a/src/map/amap/amapRead.c b/src/map/amap/amapRead.c index 471438d5..bf308c08 100644 --- a/src/map/amap/amapRead.c +++ b/src/map/amap/amapRead.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "amapInt.h" -#include "src/base/io/ioAbc.h" +#include "base/io/ioAbc.h" ABC_NAMESPACE_IMPL_START diff --git a/src/map/amap/amapRule.c b/src/map/amap/amapRule.c index 78016f4f..772c346d 100644 --- a/src/map/amap/amapRule.c +++ b/src/map/amap/amapRule.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "amapInt.h" -#include "src/bool/kit/kit.h" +#include "bool/kit/kit.h" ABC_NAMESPACE_IMPL_START diff --git a/src/map/cov/cov.h b/src/map/cov/cov.h index 135fee8c..d32e1c4c 100644 --- a/src/map/cov/cov.h +++ b/src/map/cov/cov.h @@ -21,7 +21,7 @@ #ifndef ABC__map__cov__cov_h #define ABC__map__cov__cov_h -#include "src/base/abc/abc.h" +#include "base/abc/abc.h" #include "covInt.h" diff --git a/src/map/cov/covInt.h b/src/map/cov/covInt.h index 5a75a8f3..9df3e948 100644 --- a/src/map/cov/covInt.h +++ b/src/map/cov/covInt.h @@ -21,7 +21,7 @@ #ifndef ABC__map__cov__covInt_h #define ABC__map__cov__covInt_h -#include "src/base/abc/abc.h" +#include "base/abc/abc.h" ABC_NAMESPACE_HEADER_START diff --git a/src/map/fpga/fpga.c b/src/map/fpga/fpga.c index 94a84ffd..cf88e90b 100644 --- a/src/map/fpga/fpga.c +++ b/src/map/fpga/fpga.c @@ -17,7 +17,7 @@ ***********************************************************************/ #include "fpgaInt.h" -#include "src/base/main/main.h" +#include "base/main/main.h" ABC_NAMESPACE_IMPL_START diff --git a/src/map/fpga/fpgaCreate.c b/src/map/fpga/fpgaCreate.c index e3079ad7..7fa5158e 100644 --- a/src/map/fpga/fpgaCreate.c +++ b/src/map/fpga/fpgaCreate.c @@ -17,7 +17,7 @@ ***********************************************************************/ #include "fpgaInt.h" -#include "src/base/main/main.h" +#include "base/main/main.h" ABC_NAMESPACE_IMPL_START diff --git a/src/map/fpga/fpgaInt.h b/src/map/fpga/fpgaInt.h index f2c482af..0d18b7f4 100644 --- a/src/map/fpga/fpgaInt.h +++ b/src/map/fpga/fpgaInt.h @@ -27,7 +27,7 @@ #include #include #include -#include "src/misc/extra/extra.h" +#include "misc/extra/extra.h" #include "fpga.h" ABC_NAMESPACE_HEADER_START diff --git a/src/map/fpga/fpgaTruth.c b/src/map/fpga/fpgaTruth.c index d41b1184..2965f9f6 100644 --- a/src/map/fpga/fpgaTruth.c +++ b/src/map/fpga/fpgaTruth.c @@ -17,7 +17,7 @@ ***********************************************************************/ #include "fpgaInt.h" -#include "src/bdd/cudd/cudd.h" +#include "bdd/cudd/cudd.h" ABC_NAMESPACE_IMPL_START diff --git a/src/map/if/if.h b/src/map/if/if.h index 0654c05b..bebcd3ef 100644 --- a/src/map/if/if.h +++ b/src/map/if/if.h @@ -31,9 +31,9 @@ #include #include -#include "src/misc/vec/vec.h" -#include "src/misc/mem/mem.h" -#include "src/misc/tim/tim.h" +#include "misc/vec/vec.h" +#include "misc/mem/mem.h" +#include "misc/tim/tim.h" diff --git a/src/map/if/ifDec07.c b/src/map/if/ifDec07.c index 8593d6ec..f5a21884 100644 --- a/src/map/if/ifDec07.c +++ b/src/map/if/ifDec07.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "if.h" -#include "src/misc/extra/extra.h" -#include "src/bool/kit/kit.h" +#include "misc/extra/extra.h" +#include "bool/kit/kit.h" ABC_NAMESPACE_IMPL_START diff --git a/src/map/if/ifDec08.c b/src/map/if/ifDec08.c index 15d26abf..9731a825 100644 --- a/src/map/if/ifDec08.c +++ b/src/map/if/ifDec08.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "if.h" -#include "src/misc/extra/extra.h" -#include "src/bool/kit/kit.h" +#include "misc/extra/extra.h" +#include "bool/kit/kit.h" ABC_NAMESPACE_IMPL_START diff --git a/src/map/if/ifDec10.c b/src/map/if/ifDec10.c index 917f9f53..29f926ad 100644 --- a/src/map/if/ifDec10.c +++ b/src/map/if/ifDec10.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "if.h" -#include "src/misc/extra/extra.h" -#include "src/bool/kit/kit.h" +#include "misc/extra/extra.h" +#include "bool/kit/kit.h" ABC_NAMESPACE_IMPL_START diff --git a/src/map/if/ifDec16.c b/src/map/if/ifDec16.c index d189da89..42383a0d 100644 --- a/src/map/if/ifDec16.c +++ b/src/map/if/ifDec16.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "if.h" -#include "src/bool/kit/kit.h" +#include "bool/kit/kit.h" ABC_NAMESPACE_IMPL_START diff --git a/src/map/if/ifTime.c b/src/map/if/ifTime.c index 0b86093b..ac0d2cb4 100644 --- a/src/map/if/ifTime.c +++ b/src/map/if/ifTime.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "if.h" -#include "src/bool/kit/kit.h" +#include "bool/kit/kit.h" ABC_NAMESPACE_IMPL_START diff --git a/src/map/mapper/mapper.c b/src/map/mapper/mapper.c index 87a0d4b8..20a6ab6e 100644 --- a/src/map/mapper/mapper.c +++ b/src/map/mapper/mapper.c @@ -16,9 +16,9 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/base/main/mainInt.h" -#include "src/map/mio/mio.h" +#include "base/abc/abc.h" +#include "base/main/mainInt.h" +#include "map/mio/mio.h" #include "mapperInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/map/mapper/mapperInt.h b/src/map/mapper/mapperInt.h index 95c5b0c7..5afbcca7 100644 --- a/src/map/mapper/mapperInt.h +++ b/src/map/mapper/mapperInt.h @@ -28,10 +28,10 @@ #include #include #include -#include "src/base/main/main.h" -#include "src/map/mio/mio.h" +#include "base/main/main.h" +#include "map/mio/mio.h" #include "mapper.h" -#include "src/misc/extra/extraBdd.h" +#include "misc/extra/extraBdd.h" ABC_NAMESPACE_HEADER_START diff --git a/src/map/mio/mio.c b/src/map/mio/mio.c index 619168c2..bdb618c1 100644 --- a/src/map/mio/mio.c +++ b/src/map/mio/mio.c @@ -22,10 +22,10 @@ #include #endif -#include "src/base/main/main.h" +#include "base/main/main.h" #include "mio.h" -#include "src/map/mapper/mapper.h" -#include "src/map/amap/amap.h" +#include "map/mapper/mapper.h" +#include "map/amap/amap.h" ABC_NAMESPACE_IMPL_START diff --git a/src/map/mio/mioInt.h b/src/map/mio/mioInt.h index a253ac63..3e843366 100644 --- a/src/map/mio/mioInt.h +++ b/src/map/mio/mioInt.h @@ -28,9 +28,9 @@ #include #include #include -#include "src/misc/vec/vec.h" -#include "src/misc/mem/mem.h" -#include "src/misc/st/st.h" +#include "misc/vec/vec.h" +#include "misc/mem/mem.h" +#include "misc/st/st.h" #include "mio.h" ABC_NAMESPACE_HEADER_START diff --git a/src/map/mio/mioRead.c b/src/map/mio/mioRead.c index d4e7fcd0..ea755b47 100644 --- a/src/map/mio/mioRead.c +++ b/src/map/mio/mioRead.c @@ -18,7 +18,7 @@ #include #include "mioInt.h" -#include "src/base/io/ioAbc.h" +#include "base/io/ioAbc.h" ABC_NAMESPACE_IMPL_START diff --git a/src/map/mio/mioUtils.c b/src/map/mio/mioUtils.c index fac32873..36dd1291 100644 --- a/src/map/mio/mioUtils.c +++ b/src/map/mio/mioUtils.c @@ -17,7 +17,7 @@ ***********************************************************************/ #include "mioInt.h" -#include "src/base/main/main.h" +#include "base/main/main.h" #include "exp.h" ABC_NAMESPACE_IMPL_START diff --git a/src/map/super/super.c b/src/map/super/super.c index 7976958e..28fffa6e 100644 --- a/src/map/super/super.c +++ b/src/map/super/super.c @@ -17,8 +17,8 @@ ***********************************************************************/ #include "superInt.h" -#include "src/base/main/mainInt.h" -#include "src/map/mio/mio.h" +#include "base/main/mainInt.h" +#include "map/mio/mio.h" ABC_NAMESPACE_IMPL_START diff --git a/src/map/super/superInt.h b/src/map/super/superInt.h index 5df87fac..a808eb64 100644 --- a/src/map/super/superInt.h +++ b/src/map/super/superInt.h @@ -24,11 +24,11 @@ /// INCLUDES /// //////////////////////////////////////////////////////////////////////// -#include "src/base/abc/abc.h" -#include "src/base/main/mainInt.h" -#include "src/misc/mvc/mvc.h" -#include "src/map/mio/mio.h" -#include "src/misc/st/stmm.h" +#include "base/abc/abc.h" +#include "base/main/mainInt.h" +#include "misc/mvc/mvc.h" +#include "map/mio/mio.h" +#include "misc/st/stmm.h" #include "super.h" ABC_NAMESPACE_HEADER_START diff --git a/src/misc/bar/bar.c b/src/misc/bar/bar.c index 6610b415..211fe93e 100644 --- a/src/misc/bar/bar.c +++ b/src/misc/bar/bar.c @@ -22,8 +22,8 @@ #include #include -#include "src/misc/util/abc_global.h" -#include "src/base/main/main.h" +#include "misc/util/abc_global.h" +#include "base/main/main.h" #include "bar.h" ABC_NAMESPACE_IMPL_START diff --git a/src/misc/bbl/bblif.c b/src/misc/bbl/bblif.c index eefff9f7..4ed1ef1f 100644 --- a/src/misc/bbl/bblif.c +++ b/src/misc/bbl/bblif.c @@ -23,7 +23,7 @@ #include #include -#include "src/misc/util/abc_global.h" +#include "misc/util/abc_global.h" #include "bblif.h" ABC_NAMESPACE_IMPL_START diff --git a/src/misc/bzlib/bzlib.h b/src/misc/bzlib/bzlib.h index 30487828..a1bca0bc 100644 --- a/src/misc/bzlib/bzlib.h +++ b/src/misc/bzlib/bzlib.h @@ -96,7 +96,7 @@ typedef #endif #include -#include "src/misc/util/abc_global.h" +#include "misc/util/abc_global.h" ABC_NAMESPACE_HEADER_START diff --git a/src/misc/extra/extra.h b/src/misc/extra/extra.h index 2f04e781..7b2a6f7a 100644 --- a/src/misc/extra/extra.h +++ b/src/misc/extra/extra.h @@ -43,7 +43,7 @@ #include #include -#include "src/misc/st/st.h" +#include "misc/st/st.h" ABC_NAMESPACE_HEADER_START diff --git a/src/misc/extra/extraBdd.h b/src/misc/extra/extraBdd.h index fcd10320..8341f53d 100644 --- a/src/misc/extra/extraBdd.h +++ b/src/misc/extra/extraBdd.h @@ -43,9 +43,9 @@ #include #include -#include "src/misc/st/st.h" -#include "src/bdd/cudd/cuddInt.h" -#include "src/misc/extra/extra.h" +#include "misc/st/st.h" +#include "bdd/cudd/cuddInt.h" +#include "misc/extra/extra.h" ABC_NAMESPACE_HEADER_START diff --git a/src/misc/extra/extraUtilProgress.c b/src/misc/extra/extraUtilProgress.c index 47b33196..98e6681c 100644 --- a/src/misc/extra/extraUtilProgress.c +++ b/src/misc/extra/extraUtilProgress.c @@ -20,7 +20,7 @@ #include #include "extra.h" -#include "src/base/main/main.h" +#include "base/main/main.h" ABC_NAMESPACE_IMPL_START diff --git a/src/misc/extra/extraUtilReader.c b/src/misc/extra/extraUtilReader.c index 44fc080b..732402d4 100644 --- a/src/misc/extra/extraUtilReader.c +++ b/src/misc/extra/extraUtilReader.c @@ -20,7 +20,7 @@ #include #include "extra.h" -#include "src/misc/vec/vec.h" +#include "misc/vec/vec.h" ABC_NAMESPACE_IMPL_START diff --git a/src/misc/hash/hash.h b/src/misc/hash/hash.h index 6e6c637c..3f945351 100644 --- a/src/misc/hash/hash.h +++ b/src/misc/hash/hash.h @@ -29,7 +29,7 @@ /// INCLUDES /// //////////////////////////////////////////////////////////////////////// -#include "src/misc/util/abc_global.h" +#include "misc/util/abc_global.h" #include "hashInt.h" #include "hashFlt.h" diff --git a/src/misc/hash/hashFlt.h b/src/misc/hash/hashFlt.h index c5776b46..0cd13d46 100644 --- a/src/misc/hash/hashFlt.h +++ b/src/misc/hash/hashFlt.h @@ -27,7 +27,7 @@ //////////////////////////////////////////////////////////////////////// #include -#include "src/misc/extra/extra.h" +#include "misc/extra/extra.h" ABC_NAMESPACE_HEADER_START diff --git a/src/misc/hash/hashInt.h b/src/misc/hash/hashInt.h index 81a338fc..8e0d6f0b 100644 --- a/src/misc/hash/hashInt.h +++ b/src/misc/hash/hashInt.h @@ -27,7 +27,7 @@ //////////////////////////////////////////////////////////////////////// #include -#include "src/misc/extra/extra.h" +#include "misc/extra/extra.h" ABC_NAMESPACE_HEADER_START diff --git a/src/misc/hash/hashPtr.h b/src/misc/hash/hashPtr.h index 72e2f394..b2399747 100644 --- a/src/misc/hash/hashPtr.h +++ b/src/misc/hash/hashPtr.h @@ -27,7 +27,7 @@ //////////////////////////////////////////////////////////////////////// #include -#include "src/misc/extra/extra.h" +#include "misc/extra/extra.h" ABC_NAMESPACE_HEADER_START diff --git a/src/misc/mem/mem.h b/src/misc/mem/mem.h index 0f04c160..4c0aa038 100644 --- a/src/misc/mem/mem.h +++ b/src/misc/mem/mem.h @@ -21,7 +21,7 @@ #ifndef ABC__aig__mem__mem_h #define ABC__aig__mem__mem_h -#include "src/misc/util/abc_global.h" +#include "misc/util/abc_global.h" ABC_NAMESPACE_HEADER_START diff --git a/src/misc/mvc/mvc.h b/src/misc/mvc/mvc.h index 94b9acd9..0106ce8f 100644 --- a/src/misc/mvc/mvc.h +++ b/src/misc/mvc/mvc.h @@ -25,7 +25,7 @@ //////////////////////////////////////////////////////////////////////// #include -#include "src/misc/extra/extra.h" +#include "misc/extra/extra.h" ABC_NAMESPACE_HEADER_START diff --git a/src/misc/nm/nmInt.h b/src/misc/nm/nmInt.h index 4463b276..19d688f1 100644 --- a/src/misc/nm/nmInt.h +++ b/src/misc/nm/nmInt.h @@ -26,8 +26,8 @@ /// INCLUDES /// //////////////////////////////////////////////////////////////////////// -#include "src/misc/extra/extra.h" -#include "src/misc/vec/vec.h" +#include "misc/extra/extra.h" +#include "misc/vec/vec.h" #include "nm.h" //////////////////////////////////////////////////////////////////////// diff --git a/src/misc/st/st.h b/src/misc/st/st.h index 50a8440e..2cdebcec 100644 --- a/src/misc/st/st.h +++ b/src/misc/st/st.h @@ -15,7 +15,7 @@ #define ABC__misc__st__st_h #define ST_INCLUDED -#include "src/misc/util/abc_global.h" +#include "misc/util/abc_global.h" ABC_NAMESPACE_HEADER_START diff --git a/src/misc/st/stmm.c b/src/misc/st/stmm.c index dc883a67..b7f5b87e 100644 --- a/src/misc/st/stmm.c +++ b/src/misc/st/stmm.c @@ -8,7 +8,7 @@ * */ #include -#include "src/misc/extra/extra.h" +#include "misc/extra/extra.h" #include "stmm.h" ABC_NAMESPACE_IMPL_START diff --git a/src/misc/st/stmm.h b/src/misc/st/stmm.h index 1853ce36..87daea19 100644 --- a/src/misc/st/stmm.h +++ b/src/misc/st/stmm.h @@ -14,7 +14,7 @@ #ifndef ABC__misc__st__stmm_h #define ABC__misc__st__stmm_h -#include "src/misc/util/abc_global.h" +#include "misc/util/abc_global.h" ABC_NAMESPACE_HEADER_START diff --git a/src/misc/tim/tim.c b/src/misc/tim/tim.c index c56bfaaf..4e60c216 100644 --- a/src/misc/tim/tim.c +++ b/src/misc/tim/tim.c @@ -23,8 +23,8 @@ #include #include -#include "src/misc/vec/vec.h" -#include "src/misc/mem/mem.h" +#include "misc/vec/vec.h" +#include "misc/mem/mem.h" #include "tim.h" ABC_NAMESPACE_IMPL_START diff --git a/src/misc/util/utilBridge.c b/src/misc/util/utilBridge.c index e48b54df..6180948e 100644 --- a/src/misc/util/utilBridge.c +++ b/src/misc/util/utilBridge.c @@ -23,7 +23,7 @@ #include #include -#include "src/aig/gia/gia.h" +#include "aig/gia/gia.h" ABC_NAMESPACE_IMPL_START diff --git a/src/misc/util/utilNam.c b/src/misc/util/utilNam.c index 9615b81f..7b8ea738 100644 --- a/src/misc/util/utilNam.c +++ b/src/misc/util/utilNam.c @@ -25,7 +25,7 @@ #include #include "abc_global.h" -#include "src/misc/vec/vec.h" +#include "misc/vec/vec.h" #include "utilNam.h" ABC_NAMESPACE_IMPL_START diff --git a/src/misc/vec/vec.h b/src/misc/vec/vec.h index c02cafeb..ec3a70b8 100644 --- a/src/misc/vec/vec.h +++ b/src/misc/vec/vec.h @@ -26,7 +26,7 @@ /// INCLUDES /// //////////////////////////////////////////////////////////////////////// -#include "src/misc/util/abc_global.h" +#include "misc/util/abc_global.h" #include "vecInt.h" #include "vecFlt.h" diff --git a/src/misc/zlib/adler32.c b/src/misc/zlib/adler32.c index 10208ab4..2015a327 100644 --- a/src/misc/zlib/adler32.c +++ b/src/misc/zlib/adler32.c @@ -8,7 +8,7 @@ #include #include #include -#include "src/misc/util/abc_global.h" +#include "misc/util/abc_global.h" #include "zutil.h" diff --git a/src/misc/zlib/crc32.c b/src/misc/zlib/crc32.c index 6c33b549..46c97008 100644 --- a/src/misc/zlib/crc32.c +++ b/src/misc/zlib/crc32.c @@ -29,7 +29,7 @@ #include #include #include -#include "src/misc/util/abc_global.h" +#include "misc/util/abc_global.h" #include "zutil.h" /* for STDC and FAR definitions */ diff --git a/src/misc/zlib/deflate.c b/src/misc/zlib/deflate.c index e47050bd..04dcbf09 100644 --- a/src/misc/zlib/deflate.c +++ b/src/misc/zlib/deflate.c @@ -52,7 +52,7 @@ #include #include #include -#include "src/misc/util/abc_global.h" +#include "misc/util/abc_global.h" #include "deflate.h" diff --git a/src/misc/zlib/gzclose.c b/src/misc/zlib/gzclose.c index 6cd8dc3d..4e796f6c 100644 --- a/src/misc/zlib/gzclose.c +++ b/src/misc/zlib/gzclose.c @@ -6,7 +6,7 @@ #include #include #include -#include "src/misc/util/abc_global.h" +#include "misc/util/abc_global.h" #include "gzguts.h" diff --git a/src/misc/zlib/gzguts.h b/src/misc/zlib/gzguts.h index f95db6c2..80961a54 100644 --- a/src/misc/zlib/gzguts.h +++ b/src/misc/zlib/gzguts.h @@ -61,7 +61,7 @@ #endif #include -#include "src/misc/util/abc_global.h" +#include "misc/util/abc_global.h" ABC_NAMESPACE_HEADER_START diff --git a/src/misc/zlib/gzlib.c b/src/misc/zlib/gzlib.c index 4d6fdfd0..743dccb6 100644 --- a/src/misc/zlib/gzlib.c +++ b/src/misc/zlib/gzlib.c @@ -6,7 +6,7 @@ #include #include #include -#include "src/misc/util/abc_global.h" +#include "misc/util/abc_global.h" #include "gzguts.h" diff --git a/src/misc/zlib/gzread.c b/src/misc/zlib/gzread.c index 6a4d13b6..71a6f462 100644 --- a/src/misc/zlib/gzread.c +++ b/src/misc/zlib/gzread.c @@ -6,7 +6,7 @@ #include #include #include -#include "src/misc/util/abc_global.h" +#include "misc/util/abc_global.h" #include "gzguts.h" diff --git a/src/misc/zlib/gzwrite.c b/src/misc/zlib/gzwrite.c index f7482615..44e116de 100644 --- a/src/misc/zlib/gzwrite.c +++ b/src/misc/zlib/gzwrite.c @@ -6,7 +6,7 @@ #include #include #include -#include "src/misc/util/abc_global.h" +#include "misc/util/abc_global.h" #include "gzguts.h" diff --git a/src/misc/zlib/infback.c b/src/misc/zlib/infback.c index 7163f99d..7559f7fd 100644 --- a/src/misc/zlib/infback.c +++ b/src/misc/zlib/infback.c @@ -13,7 +13,7 @@ #include #include #include -#include "src/misc/util/abc_global.h" +#include "misc/util/abc_global.h" #include "zutil.h" #include "inftrees.h" diff --git a/src/misc/zlib/inffast.c b/src/misc/zlib/inffast.c index fbdf94d0..a44d180e 100644 --- a/src/misc/zlib/inffast.c +++ b/src/misc/zlib/inffast.c @@ -6,7 +6,7 @@ #include #include #include -#include "src/misc/util/abc_global.h" +#include "misc/util/abc_global.h" #include "zutil.h" #include "inftrees.h" diff --git a/src/misc/zlib/inflate.c b/src/misc/zlib/inflate.c index 04feb237..449779a9 100644 --- a/src/misc/zlib/inflate.c +++ b/src/misc/zlib/inflate.c @@ -83,7 +83,7 @@ #include #include #include -#include "src/misc/util/abc_global.h" +#include "misc/util/abc_global.h" #include "zutil.h" #include "inftrees.h" diff --git a/src/misc/zlib/inftrees.c b/src/misc/zlib/inftrees.c index a73e58a8..f3835cfc 100644 --- a/src/misc/zlib/inftrees.c +++ b/src/misc/zlib/inftrees.c @@ -6,7 +6,7 @@ #include #include #include -#include "src/misc/util/abc_global.h" +#include "misc/util/abc_global.h" #include "zutil.h" #include "inftrees.h" diff --git a/src/misc/zlib/trees.c b/src/misc/zlib/trees.c index a7365594..b61bae81 100644 --- a/src/misc/zlib/trees.c +++ b/src/misc/zlib/trees.c @@ -37,7 +37,7 @@ #include #include #include -#include "src/misc/util/abc_global.h" +#include "misc/util/abc_global.h" #include "deflate.h" diff --git a/src/misc/zlib/uncompr.c b/src/misc/zlib/uncompr.c index cf021273..fedb3ed2 100644 --- a/src/misc/zlib/uncompr.c +++ b/src/misc/zlib/uncompr.c @@ -8,7 +8,7 @@ #include #include #include -#include "src/misc/util/abc_global.h" +#include "misc/util/abc_global.h" #define ZLIB_INTERNAL #include "zlib.h" diff --git a/src/misc/zlib/zlib.h b/src/misc/zlib/zlib.h index 0fd12170..46c1a1ae 100644 --- a/src/misc/zlib/zlib.h +++ b/src/misc/zlib/zlib.h @@ -39,7 +39,7 @@ #include #endif -#include "src/misc/util/abc_global.h" +#include "misc/util/abc_global.h" #include "zconf.h" diff --git a/src/misc/zlib/zutil.c b/src/misc/zlib/zutil.c index b74b21ea..fbf67f1b 100644 --- a/src/misc/zlib/zutil.c +++ b/src/misc/zlib/zutil.c @@ -8,7 +8,7 @@ #include #include #include -#include "src/misc/util/abc_global.h" +#include "misc/util/abc_global.h" #include "zutil.h" diff --git a/src/opt/cgt/cgtCore.c b/src/opt/cgt/cgtCore.c index 82f4e105..a24b180b 100644 --- a/src/opt/cgt/cgtCore.c +++ b/src/opt/cgt/cgtCore.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "cgtInt.h" -#include "src/misc/bar/bar.h" +#include "misc/bar/bar.h" ABC_NAMESPACE_IMPL_START diff --git a/src/opt/cgt/cgtDecide.c b/src/opt/cgt/cgtDecide.c index 4e4a57b1..63730f55 100644 --- a/src/opt/cgt/cgtDecide.c +++ b/src/opt/cgt/cgtDecide.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "cgtInt.h" -#include "src/proof/ssw/sswInt.h" +#include "proof/ssw/sswInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/opt/cgt/cgtInt.h b/src/opt/cgt/cgtInt.h index 78c27224..b73d60dd 100644 --- a/src/opt/cgt/cgtInt.h +++ b/src/opt/cgt/cgtInt.h @@ -26,9 +26,9 @@ /// INCLUDES /// //////////////////////////////////////////////////////////////////////// -#include "src/aig/saig/saig.h" -#include "src/sat/bsat/satSolver.h" -#include "src/sat/cnf/cnf.h" +#include "aig/saig/saig.h" +#include "sat/bsat/satSolver.h" +#include "sat/cnf/cnf.h" #include "cgt.h" //////////////////////////////////////////////////////////////////////// diff --git a/src/opt/csw/cswInt.h b/src/opt/csw/cswInt.h index 65228fcd..4f8dac39 100644 --- a/src/opt/csw/cswInt.h +++ b/src/opt/csw/cswInt.h @@ -31,9 +31,9 @@ #include #include -#include "src/aig/aig/aig.h" -#include "src/opt/dar/dar.h" -#include "src/bool/kit/kit.h" +#include "aig/aig/aig.h" +#include "opt/dar/dar.h" +#include "bool/kit/kit.h" #include "csw.h" //////////////////////////////////////////////////////////////////////// diff --git a/src/opt/cut/cutInt.h b/src/opt/cut/cutInt.h index a66a5786..754779a3 100644 --- a/src/opt/cut/cutInt.h +++ b/src/opt/cut/cutInt.h @@ -27,8 +27,8 @@ //////////////////////////////////////////////////////////////////////// #include -#include "src/misc/extra/extra.h" -#include "src/misc/vec/vec.h" +#include "misc/extra/extra.h" +#include "misc/vec/vec.h" #include "cut.h" #include "cutList.h" diff --git a/src/opt/dar/darBalance.c b/src/opt/dar/darBalance.c index 34559bec..75f0eaf4 100644 --- a/src/opt/dar/darBalance.c +++ b/src/opt/dar/darBalance.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "darInt.h" -#include "src/misc/tim/tim.h" +#include "misc/tim/tim.h" ABC_NAMESPACE_IMPL_START diff --git a/src/opt/dar/darData.c b/src/opt/dar/darData.c index 8257f4bb..eaebb40d 100644 --- a/src/opt/dar/darData.c +++ b/src/opt/dar/darData.c @@ -11145,7 +11145,7 @@ Vec_Int_t * Dar_LibReadPrios() #if 0 -#include "src/base/abc/abc.h" +#include "base/abc/abc.h" ABC_NAMESPACE_IMPL_START diff --git a/src/opt/dar/darInt.h b/src/opt/dar/darInt.h index 6bf347e1..08a905a8 100644 --- a/src/opt/dar/darInt.h +++ b/src/opt/dar/darInt.h @@ -31,8 +31,8 @@ #include #include -#include "src/misc/vec/vec.h" -#include "src/aig/aig/aig.h" +#include "misc/vec/vec.h" +#include "aig/aig/aig.h" #include "dar.h" //////////////////////////////////////////////////////////////////////// diff --git a/src/opt/dar/darLib.c b/src/opt/dar/darLib.c index acf49b02..27408328 100644 --- a/src/opt/dar/darLib.c +++ b/src/opt/dar/darLib.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "darInt.h" -#include "src/aig/gia/gia.h" +#include "aig/gia/gia.h" #include "dar.h" ABC_NAMESPACE_IMPL_START diff --git a/src/opt/dar/darMan.c b/src/opt/dar/darMan.c index 5a3e0687..dc81e759 100644 --- a/src/opt/dar/darMan.c +++ b/src/opt/dar/darMan.c @@ -144,7 +144,7 @@ void Dar_ManPrintStats( Dar_Man_t * p ) ABC_NAMESPACE_IMPL_END -#include "src/bool/kit/kit.h" +#include "bool/kit/kit.h" ABC_NAMESPACE_IMPL_START diff --git a/src/opt/dar/darRefact.c b/src/opt/dar/darRefact.c index dcfbeac7..0dcb54e8 100644 --- a/src/opt/dar/darRefact.c +++ b/src/opt/dar/darRefact.c @@ -19,10 +19,10 @@ ***********************************************************************/ #include "darInt.h" -#include "src/bool/kit/kit.h" +#include "bool/kit/kit.h" -#include "src/bool/bdc/bdc.h" -#include "src/bool/bdc/bdcInt.h" +#include "bool/bdc/bdc.h" +#include "bool/bdc/bdcInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/opt/dar/darScript.c b/src/opt/dar/darScript.c index b59626af..b3830cc3 100644 --- a/src/opt/dar/darScript.c +++ b/src/opt/dar/darScript.c @@ -19,9 +19,9 @@ ***********************************************************************/ #include "darInt.h" -#include "src/proof/dch/dch.h" -#include "src/aig/gia/gia.h" -#include "src/aig/gia/giaAig.h" +#include "proof/dch/dch.h" +#include "aig/gia/gia.h" +#include "aig/gia/giaAig.h" ABC_NAMESPACE_IMPL_START diff --git a/src/opt/fxu/fxu.h b/src/opt/fxu/fxu.h index 28856c28..822536a2 100644 --- a/src/opt/fxu/fxu.h +++ b/src/opt/fxu/fxu.h @@ -24,7 +24,7 @@ /// INCLUDES /// //////////////////////////////////////////////////////////////////////// -#include "src/misc/vec/vec.h" +#include "misc/vec/vec.h" //////////////////////////////////////////////////////////////////////// /// PARAMETERS /// diff --git a/src/opt/fxu/fxuInt.h b/src/opt/fxu/fxuInt.h index 1ca081c9..b68f9ea6 100644 --- a/src/opt/fxu/fxuInt.h +++ b/src/opt/fxu/fxuInt.h @@ -24,7 +24,7 @@ /// INCLUDES /// //////////////////////////////////////////////////////////////////////// -#include "src/base/abc/abc.h" +#include "base/abc/abc.h" ABC_NAMESPACE_HEADER_START diff --git a/src/opt/fxu/fxuReduce.c b/src/opt/fxu/fxuReduce.c index f9d88f7a..b8640158 100644 --- a/src/opt/fxu/fxuReduce.c +++ b/src/opt/fxu/fxuReduce.c @@ -16,7 +16,7 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" +#include "base/abc/abc.h" #include "fxuInt.h" #include "fxu.h" diff --git a/src/opt/fxu/fxuSingle.c b/src/opt/fxu/fxuSingle.c index e4fd0c5c..615a3639 100644 --- a/src/opt/fxu/fxuSingle.c +++ b/src/opt/fxu/fxuSingle.c @@ -17,7 +17,7 @@ ***********************************************************************/ #include "fxuInt.h" -#include "src/misc/vec/vec.h" +#include "misc/vec/vec.h" ABC_NAMESPACE_IMPL_START diff --git a/src/opt/lpk/lpkCore.c b/src/opt/lpk/lpkCore.c index 6ab13bda..f7f3d5c5 100644 --- a/src/opt/lpk/lpkCore.c +++ b/src/opt/lpk/lpkCore.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "lpkInt.h" -#include "src/bool/kit/cloud.h" -#include "src/base/main/main.h" +#include "bool/kit/cloud.h" +#include "base/main/main.h" ABC_NAMESPACE_IMPL_START diff --git a/src/opt/lpk/lpkCut.c b/src/opt/lpk/lpkCut.c index c4be0c35..73711f2b 100644 --- a/src/opt/lpk/lpkCut.c +++ b/src/opt/lpk/lpkCut.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "lpkInt.h" -#include "src/bool/kit/cloud.h" +#include "bool/kit/cloud.h" ABC_NAMESPACE_IMPL_START diff --git a/src/opt/lpk/lpkInt.h b/src/opt/lpk/lpkInt.h index 2ff47dc4..053cfe96 100644 --- a/src/opt/lpk/lpkInt.h +++ b/src/opt/lpk/lpkInt.h @@ -26,9 +26,9 @@ /// INCLUDES /// //////////////////////////////////////////////////////////////////////// -#include "src/base/abc/abc.h" -#include "src/bool/kit/kit.h" -#include "src/map/if/if.h" +#include "base/abc/abc.h" +#include "bool/kit/kit.h" +#include "map/if/if.h" #include "lpk.h" //////////////////////////////////////////////////////////////////////// diff --git a/src/opt/mfs/mfsInt.h b/src/opt/mfs/mfsInt.h index 8b28fe61..44346997 100644 --- a/src/opt/mfs/mfsInt.h +++ b/src/opt/mfs/mfsInt.h @@ -26,14 +26,14 @@ /// INCLUDES /// //////////////////////////////////////////////////////////////////////// -#include "src/base/abc/abc.h" +#include "base/abc/abc.h" #include "mfs.h" -#include "src/aig/aig/aig.h" -#include "src/sat/cnf/cnf.h" -#include "src/sat/bsat/satSolver.h" -#include "src/sat/bsat/satStore.h" -#include "src/bool/bdc/bdc.h" -#include "src/aig/gia/gia.h" +#include "aig/aig/aig.h" +#include "sat/cnf/cnf.h" +#include "sat/bsat/satSolver.h" +#include "sat/bsat/satStore.h" +#include "bool/bdc/bdc.h" +#include "aig/gia/gia.h" //////////////////////////////////////////////////////////////////////// /// PARAMETERS /// diff --git a/src/opt/mfs/mfsInter.c b/src/opt/mfs/mfsInter.c index 08713c75..812e22cf 100644 --- a/src/opt/mfs/mfsInter.c +++ b/src/opt/mfs/mfsInter.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "mfsInt.h" -#include "src/bool/kit/kit.h" +#include "bool/kit/kit.h" ABC_NAMESPACE_IMPL_START diff --git a/src/opt/mfs/mfsStrash.c b/src/opt/mfs/mfsStrash.c index 5681564e..6f8891b3 100644 --- a/src/opt/mfs/mfsStrash.c +++ b/src/opt/mfs/mfsStrash.c @@ -367,7 +367,7 @@ Aig_Man_t * Abc_NtkAigForConstraints( Mfs_Man_t * p, Abc_Obj_t * pNode ) ABC_NAMESPACE_IMPL_END -#include "src/proof/fra/fra.h" +#include "proof/fra/fra.h" ABC_NAMESPACE_IMPL_START diff --git a/src/opt/nwk/nwk.h b/src/opt/nwk/nwk.h index 79c7bb1a..e7e43b91 100644 --- a/src/opt/nwk/nwk.h +++ b/src/opt/nwk/nwk.h @@ -26,14 +26,14 @@ /// INCLUDES /// //////////////////////////////////////////////////////////////////////// -#include "src/aig/aig/aig.h" -#include "src/aig/hop/hop.h" -#include "src/misc/tim/tim.h" -#include "src/map/if/if.h" -#include "src/bool/bdc/bdc.h" - -#include "src/proof/fra/fra.h" -#include "src/proof/ssw/ssw.h" +#include "aig/aig/aig.h" +#include "aig/hop/hop.h" +#include "misc/tim/tim.h" +#include "map/if/if.h" +#include "bool/bdc/bdc.h" + +#include "proof/fra/fra.h" +#include "proof/ssw/ssw.h" #include "ntlnwk.h" //////////////////////////////////////////////////////////////////////// diff --git a/src/opt/nwk/nwkAig.c b/src/opt/nwk/nwkAig.c index ec5b43b1..55cff367 100644 --- a/src/opt/nwk/nwkAig.c +++ b/src/opt/nwk/nwkAig.c @@ -105,7 +105,7 @@ Vec_Ptr_t * Nwk_ManDeriveRetimingCut( Aig_Man_t * p, int fForward, int fVerbose -#include "src/aig/gia/gia.h" +#include "aig/gia/gia.h" /**Function************************************************************* diff --git a/src/opt/nwk/nwkMap.c b/src/opt/nwk/nwkMap.c index 3de55c43..e80c4c93 100644 --- a/src/opt/nwk/nwkMap.c +++ b/src/opt/nwk/nwkMap.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "nwk.h" -#include "src/map/if/if.h" +#include "map/if/if.h" ABC_NAMESPACE_IMPL_START diff --git a/src/opt/nwk/nwkUtil.c b/src/opt/nwk/nwkUtil.c index cf3e5bf3..2771e723 100644 --- a/src/opt/nwk/nwkUtil.c +++ b/src/opt/nwk/nwkUtil.c @@ -20,7 +20,7 @@ #include #include "nwk.h" -#include "src/bool/kit/kit.h" +#include "bool/kit/kit.h" ABC_NAMESPACE_IMPL_START diff --git a/src/opt/res/resCore.c b/src/opt/res/resCore.c index 7d681299..d7edf189 100644 --- a/src/opt/res/resCore.c +++ b/src/opt/res/resCore.c @@ -18,10 +18,10 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" +#include "base/abc/abc.h" #include "resInt.h" -#include "src/bool/kit/kit.h" -#include "src/sat/bsat/satStore.h" +#include "bool/kit/kit.h" +#include "sat/bsat/satStore.h" ABC_NAMESPACE_IMPL_START diff --git a/src/opt/res/resDivs.c b/src/opt/res/resDivs.c index f378991d..c3bf0554 100644 --- a/src/opt/res/resDivs.c +++ b/src/opt/res/resDivs.c @@ -18,7 +18,7 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" +#include "base/abc/abc.h" #include "resInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/opt/res/resFilter.c b/src/opt/res/resFilter.c index 188b9dc3..c810284e 100644 --- a/src/opt/res/resFilter.c +++ b/src/opt/res/resFilter.c @@ -18,7 +18,7 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" +#include "base/abc/abc.h" #include "resInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/opt/res/resSat.c b/src/opt/res/resSat.c index eec4012a..6e209ad9 100644 --- a/src/opt/res/resSat.c +++ b/src/opt/res/resSat.c @@ -18,10 +18,10 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" +#include "base/abc/abc.h" #include "resInt.h" -#include "src/aig/hop/hop.h" -#include "src/sat/bsat/satSolver.h" +#include "aig/hop/hop.h" +#include "sat/bsat/satSolver.h" ABC_NAMESPACE_IMPL_START diff --git a/src/opt/res/resSim.c b/src/opt/res/resSim.c index d8faf8bf..d4088e7b 100644 --- a/src/opt/res/resSim.c +++ b/src/opt/res/resSim.c @@ -18,7 +18,7 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" +#include "base/abc/abc.h" #include "resInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/opt/res/resStrash.c b/src/opt/res/resStrash.c index c080a718..93466b2e 100644 --- a/src/opt/res/resStrash.c +++ b/src/opt/res/resStrash.c @@ -18,7 +18,7 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" +#include "base/abc/abc.h" #include "resInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/opt/res/resWin.c b/src/opt/res/resWin.c index 09176833..b6b892a9 100644 --- a/src/opt/res/resWin.c +++ b/src/opt/res/resWin.c @@ -18,7 +18,7 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" +#include "base/abc/abc.h" #include "resInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/opt/ret/retInt.h b/src/opt/ret/retInt.h index 9460f6e8..9b0e4973 100644 --- a/src/opt/ret/retInt.h +++ b/src/opt/ret/retInt.h @@ -26,7 +26,7 @@ /// INCLUDES /// //////////////////////////////////////////////////////////////////////// -#include "src/base/abc/abc.h" +#include "base/abc/abc.h" ABC_NAMESPACE_HEADER_START diff --git a/src/opt/rwr/rwr.h b/src/opt/rwr/rwr.h index d6c57329..74af4caa 100644 --- a/src/opt/rwr/rwr.h +++ b/src/opt/rwr/rwr.h @@ -26,8 +26,8 @@ /// INCLUDES /// //////////////////////////////////////////////////////////////////////// -#include "src/base/abc/abc.h" -#include "src/opt/cut/cut.h" +#include "base/abc/abc.h" +#include "opt/cut/cut.h" //////////////////////////////////////////////////////////////////////// /// PARAMETERS /// diff --git a/src/opt/rwr/rwrDec.c b/src/opt/rwr/rwrDec.c index c1860a7b..43a2c0c6 100644 --- a/src/opt/rwr/rwrDec.c +++ b/src/opt/rwr/rwrDec.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "rwr.h" -#include "src/bool/dec/dec.h" +#include "bool/dec/dec.h" ABC_NAMESPACE_IMPL_START diff --git a/src/opt/rwr/rwrEva.c b/src/opt/rwr/rwrEva.c index d3d5143c..de29e153 100644 --- a/src/opt/rwr/rwrEva.c +++ b/src/opt/rwr/rwrEva.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "rwr.h" -#include "src/bool/dec/dec.h" -#include "src/aig/ivy/ivy.h" +#include "bool/dec/dec.h" +#include "aig/ivy/ivy.h" ABC_NAMESPACE_IMPL_START diff --git a/src/opt/rwr/rwrMan.c b/src/opt/rwr/rwrMan.c index 78ee2067..0f0631bc 100644 --- a/src/opt/rwr/rwrMan.c +++ b/src/opt/rwr/rwrMan.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "rwr.h" -#include "src/base/main/main.h" -#include "src/bool/dec/dec.h" +#include "base/main/main.h" +#include "bool/dec/dec.h" ABC_NAMESPACE_IMPL_START diff --git a/src/opt/rwt/rwt.h b/src/opt/rwt/rwt.h index 2e6de2cd..ff00cf52 100644 --- a/src/opt/rwt/rwt.h +++ b/src/opt/rwt/rwt.h @@ -31,9 +31,9 @@ #include #include -#include "src/misc/vec/vec.h" -#include "src/misc/extra/extra.h" -#include "src/misc/mem/mem.h" +#include "misc/vec/vec.h" +#include "misc/extra/extra.h" +#include "misc/mem/mem.h" //////////////////////////////////////////////////////////////////////// /// PARAMETERS /// diff --git a/src/opt/rwt/rwtDec.c b/src/opt/rwt/rwtDec.c index 82283a91..bc5bcad2 100644 --- a/src/opt/rwt/rwtDec.c +++ b/src/opt/rwt/rwtDec.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "rwt.h" -#include "src/bool/deco/deco.h" +#include "bool/deco/deco.h" ABC_NAMESPACE_IMPL_START diff --git a/src/opt/rwt/rwtMan.c b/src/opt/rwt/rwtMan.c index 17799407..18998ac8 100644 --- a/src/opt/rwt/rwtMan.c +++ b/src/opt/rwt/rwtMan.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "rwt.h" -#include "src/bool/deco/deco.h" +#include "bool/deco/deco.h" ABC_NAMESPACE_IMPL_START diff --git a/src/opt/sim/simMan.c b/src/opt/sim/simMan.c index 9856f484..ecee0424 100644 --- a/src/opt/sim/simMan.c +++ b/src/opt/sim/simMan.c @@ -18,7 +18,7 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" +#include "base/abc/abc.h" #include "sim.h" ABC_NAMESPACE_IMPL_START diff --git a/src/opt/sim/simSat.c b/src/opt/sim/simSat.c index 5c97055b..54eecf9d 100644 --- a/src/opt/sim/simSat.c +++ b/src/opt/sim/simSat.c @@ -18,7 +18,7 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" +#include "base/abc/abc.h" #include "sim.h" ABC_NAMESPACE_IMPL_START diff --git a/src/opt/sim/simSeq.c b/src/opt/sim/simSeq.c index 0efe7378..31cac237 100644 --- a/src/opt/sim/simSeq.c +++ b/src/opt/sim/simSeq.c @@ -18,7 +18,7 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" +#include "base/abc/abc.h" #include "sim.h" ABC_NAMESPACE_IMPL_START diff --git a/src/opt/sim/simSupp.c b/src/opt/sim/simSupp.c index b383376e..1cf13fa8 100644 --- a/src/opt/sim/simSupp.c +++ b/src/opt/sim/simSupp.c @@ -18,8 +18,8 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/proof/fraig/fraig.h" +#include "base/abc/abc.h" +#include "proof/fraig/fraig.h" #include "sim.h" ABC_NAMESPACE_IMPL_START diff --git a/src/opt/sim/simSwitch.c b/src/opt/sim/simSwitch.c index 26f8cd51..b462437b 100644 --- a/src/opt/sim/simSwitch.c +++ b/src/opt/sim/simSwitch.c @@ -18,7 +18,7 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" +#include "base/abc/abc.h" #include "sim.h" ABC_NAMESPACE_IMPL_START diff --git a/src/opt/sim/simSym.c b/src/opt/sim/simSym.c index 0367c2af..8f99dc54 100644 --- a/src/opt/sim/simSym.c +++ b/src/opt/sim/simSym.c @@ -18,7 +18,7 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" +#include "base/abc/abc.h" #include "sim.h" ABC_NAMESPACE_IMPL_START diff --git a/src/opt/sim/simSymSat.c b/src/opt/sim/simSymSat.c index e252e0f4..14ec6806 100644 --- a/src/opt/sim/simSymSat.c +++ b/src/opt/sim/simSymSat.c @@ -18,8 +18,8 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/proof/fraig/fraig.h" +#include "base/abc/abc.h" +#include "proof/fraig/fraig.h" #include "sim.h" ABC_NAMESPACE_IMPL_START diff --git a/src/opt/sim/simSymSim.c b/src/opt/sim/simSymSim.c index 2c2a8a9e..811397a5 100644 --- a/src/opt/sim/simSymSim.c +++ b/src/opt/sim/simSymSim.c @@ -18,7 +18,7 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" +#include "base/abc/abc.h" #include "sim.h" ABC_NAMESPACE_IMPL_START diff --git a/src/opt/sim/simSymStr.c b/src/opt/sim/simSymStr.c index b9d58b9f..af51cee7 100644 --- a/src/opt/sim/simSymStr.c +++ b/src/opt/sim/simSymStr.c @@ -18,7 +18,7 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" +#include "base/abc/abc.h" #include "sim.h" ABC_NAMESPACE_IMPL_START diff --git a/src/opt/sim/simUtils.c b/src/opt/sim/simUtils.c index 586fab42..975c57a6 100644 --- a/src/opt/sim/simUtils.c +++ b/src/opt/sim/simUtils.c @@ -18,7 +18,7 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" +#include "base/abc/abc.h" #include "sim.h" ABC_NAMESPACE_IMPL_START diff --git a/src/proof/bbr/bbr.h b/src/proof/bbr/bbr.h index 71061759..1db638e8 100644 --- a/src/proof/bbr/bbr.h +++ b/src/proof/bbr/bbr.h @@ -27,9 +27,9 @@ //////////////////////////////////////////////////////////////////////// #include -#include "src/aig/aig/aig.h" -#include "src/aig/saig/saig.h" -#include "src/bdd/cudd/cuddInt.h" +#include "aig/aig/aig.h" +#include "aig/saig/saig.h" +#include "bdd/cudd/cuddInt.h" //////////////////////////////////////////////////////////////////////// /// PARAMETERS /// diff --git a/src/proof/bbr/bbrImage.c b/src/proof/bbr/bbrImage.c index 23b43169..1ff3d0b6 100644 --- a/src/proof/bbr/bbrImage.c +++ b/src/proof/bbr/bbrImage.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "bbr.h" -#include "src/bdd/mtr/mtr.h" +#include "bdd/mtr/mtr.h" ABC_NAMESPACE_IMPL_START diff --git a/src/proof/cec/cecCec.c b/src/proof/cec/cecCec.c index 841b6a0b..30c930a0 100644 --- a/src/proof/cec/cecCec.c +++ b/src/proof/cec/cecCec.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "cecInt.h" -#include "src/proof/fra/fra.h" -#include "src/aig/gia/giaAig.h" +#include "proof/fra/fra.h" +#include "aig/gia/giaAig.h" ABC_NAMESPACE_IMPL_START diff --git a/src/proof/cec/cecChoice.c b/src/proof/cec/cecChoice.c index 05b372f8..b18a545f 100644 --- a/src/proof/cec/cecChoice.c +++ b/src/proof/cec/cecChoice.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "cecInt.h" -#include "src/aig/gia/giaAig.h" -#include "src/proof/dch/dch.h" +#include "aig/gia/giaAig.h" +#include "proof/dch/dch.h" ABC_NAMESPACE_IMPL_START diff --git a/src/proof/cec/cecInt.h b/src/proof/cec/cecInt.h index 8d9fe472..36ff3483 100644 --- a/src/proof/cec/cecInt.h +++ b/src/proof/cec/cecInt.h @@ -26,9 +26,9 @@ /// INCLUDES /// //////////////////////////////////////////////////////////////////////// -#include "src/sat/bsat/satSolver.h" -#include "src/misc/bar/bar.h" -#include "src/aig/gia/gia.h" +#include "sat/bsat/satSolver.h" +#include "misc/bar/bar.h" +#include "aig/gia/gia.h" #include "cec.h" //////////////////////////////////////////////////////////////////////// diff --git a/src/proof/cec/cecSynth.c b/src/proof/cec/cecSynth.c index b13b5204..6fc991a8 100644 --- a/src/proof/cec/cecSynth.c +++ b/src/proof/cec/cecSynth.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "cecInt.h" -#include "src/aig/gia/giaAig.h" +#include "aig/gia/giaAig.h" ABC_NAMESPACE_IMPL_START diff --git a/src/proof/dch/dchInt.h b/src/proof/dch/dchInt.h index b22834cf..05f4271d 100644 --- a/src/proof/dch/dchInt.h +++ b/src/proof/dch/dchInt.h @@ -26,8 +26,8 @@ /// INCLUDES /// //////////////////////////////////////////////////////////////////////// -#include "src/aig/aig/aig.h" -#include "src/sat/bsat/satSolver.h" +#include "aig/aig/aig.h" +#include "sat/bsat/satSolver.h" #include "dch.h" //////////////////////////////////////////////////////////////////////// diff --git a/src/proof/dch/dchSweep.c b/src/proof/dch/dchSweep.c index dafab06e..f807b638 100644 --- a/src/proof/dch/dchSweep.c +++ b/src/proof/dch/dchSweep.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "dchInt.h" -#include "src/misc/bar/bar.h" +#include "misc/bar/bar.h" ABC_NAMESPACE_IMPL_START diff --git a/src/proof/fra/fra.h b/src/proof/fra/fra.h index c1dd6b44..922a3c47 100644 --- a/src/proof/fra/fra.h +++ b/src/proof/fra/fra.h @@ -31,11 +31,11 @@ #include #include -#include "src/misc/vec/vec.h" -#include "src/aig/aig/aig.h" -#include "src/opt/dar/dar.h" -#include "src/sat/bsat/satSolver.h" -#include "src/aig/ioa/ioa.h" +#include "misc/vec/vec.h" +#include "aig/aig/aig.h" +#include "opt/dar/dar.h" +#include "sat/bsat/satSolver.h" +#include "aig/ioa/ioa.h" //////////////////////////////////////////////////////////////////////// /// PARAMETERS /// diff --git a/src/proof/fra/fraCec.c b/src/proof/fra/fraCec.c index 20805ec2..f1f15155 100644 --- a/src/proof/fra/fraCec.c +++ b/src/proof/fra/fraCec.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "fra.h" -#include "src/sat/cnf/cnf.h" -#include "src/sat/bsat/satSolver2.h" +#include "sat/cnf/cnf.h" +#include "sat/bsat/satSolver2.h" ABC_NAMESPACE_IMPL_START diff --git a/src/proof/fra/fraClau.c b/src/proof/fra/fraClau.c index 6c692afa..a2db1e65 100644 --- a/src/proof/fra/fraClau.c +++ b/src/proof/fra/fraClau.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "fra.h" -#include "src/sat/cnf/cnf.h" -#include "src/sat/bsat/satSolver.h" +#include "sat/cnf/cnf.h" +#include "sat/bsat/satSolver.h" ABC_NAMESPACE_IMPL_START diff --git a/src/proof/fra/fraClaus.c b/src/proof/fra/fraClaus.c index 97ac3e40..95ab0c99 100644 --- a/src/proof/fra/fraClaus.c +++ b/src/proof/fra/fraClaus.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "fra.h" -#include "src/sat/cnf/cnf.h" -#include "src/sat/bsat/satSolver.h" +#include "sat/cnf/cnf.h" +#include "sat/bsat/satSolver.h" ABC_NAMESPACE_IMPL_START diff --git a/src/proof/fra/fraInd.c b/src/proof/fra/fraInd.c index 0c7134aa..e0a54a4e 100644 --- a/src/proof/fra/fraInd.c +++ b/src/proof/fra/fraInd.c @@ -19,9 +19,9 @@ ***********************************************************************/ #include "fra.h" -#include "src/sat/cnf/cnf.h" -#include "src/opt/dar/dar.h" -#include "src/aig/saig/saig.h" +#include "sat/cnf/cnf.h" +#include "opt/dar/dar.h" +#include "aig/saig/saig.h" ABC_NAMESPACE_IMPL_START diff --git a/src/proof/fra/fraIndVer.c b/src/proof/fra/fraIndVer.c index 099256ac..26b64647 100644 --- a/src/proof/fra/fraIndVer.c +++ b/src/proof/fra/fraIndVer.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "fra.h" -#include "src/sat/cnf/cnf.h" +#include "sat/cnf/cnf.h" ABC_NAMESPACE_IMPL_START diff --git a/src/proof/fra/fraSec.c b/src/proof/fra/fraSec.c index ac6cd67e..c43fc4dd 100644 --- a/src/proof/fra/fraSec.c +++ b/src/proof/fra/fraSec.c @@ -19,12 +19,12 @@ ***********************************************************************/ #include "fra.h" -#include "src/aig/ioa/ioa.h" -#include "src/proof/int/int.h" -#include "src/proof/ssw/ssw.h" -#include "src/aig/saig/saig.h" -#include "src/proof/bbr/bbr.h" -#include "src/proof/pdr/pdr.h" +#include "aig/ioa/ioa.h" +#include "proof/int/int.h" +#include "proof/ssw/ssw.h" +#include "aig/saig/saig.h" +#include "proof/bbr/bbr.h" +#include "proof/pdr/pdr.h" ABC_NAMESPACE_IMPL_START diff --git a/src/proof/fra/fraSim.c b/src/proof/fra/fraSim.c index 555789e2..76e0a132 100644 --- a/src/proof/fra/fraSim.c +++ b/src/proof/fra/fraSim.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "fra.h" -#include "src/aig/saig/saig.h" +#include "aig/saig/saig.h" ABC_NAMESPACE_IMPL_START diff --git a/src/proof/fraig/fraigInt.h b/src/proof/fraig/fraigInt.h index 1ff8727e..bcd745d1 100644 --- a/src/proof/fraig/fraigInt.h +++ b/src/proof/fraig/fraigInt.h @@ -29,9 +29,9 @@ #include #include -#include "src/misc/util/abc_global.h" +#include "misc/util/abc_global.h" #include "fraig.h" -#include "src/sat/msat/msat.h" +#include "sat/msat/msat.h" ABC_NAMESPACE_HEADER_START diff --git a/src/proof/fraig/fraigSat.c b/src/proof/fraig/fraigSat.c index 7a11c072..fb3f1fec 100644 --- a/src/proof/fraig/fraigSat.c +++ b/src/proof/fraig/fraigSat.c @@ -18,7 +18,7 @@ #include #include "fraigInt.h" -#include "src/sat/msat/msatInt.h" +#include "sat/msat/msatInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/proof/int/intContain.c b/src/proof/int/intContain.c index a031c7a4..8ed6624d 100644 --- a/src/proof/int/intContain.c +++ b/src/proof/int/intContain.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "intInt.h" -#include "src/proof/fra/fra.h" +#include "proof/fra/fra.h" ABC_NAMESPACE_IMPL_START @@ -245,7 +245,7 @@ int Inter_ManCheckInductiveContainment( Aig_Man_t * pTrans, Aig_Man_t * pInter, } ABC_NAMESPACE_IMPL_END -#include "src/proof/fra/fra.h" +#include "proof/fra/fra.h" ABC_NAMESPACE_IMPL_START diff --git a/src/proof/int/intCtrex.c b/src/proof/int/intCtrex.c index 840ae75d..9b2946e9 100644 --- a/src/proof/int/intCtrex.c +++ b/src/proof/int/intCtrex.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "intInt.h" -#include "src/proof/ssw/ssw.h" +#include "proof/ssw/ssw.h" ABC_NAMESPACE_IMPL_START diff --git a/src/proof/int/intInt.h b/src/proof/int/intInt.h index ec2a0356..b7f7a2a7 100644 --- a/src/proof/int/intInt.h +++ b/src/proof/int/intInt.h @@ -26,10 +26,10 @@ /// INCLUDES /// //////////////////////////////////////////////////////////////////////// -#include "src/aig/saig/saig.h" -#include "src/sat/cnf/cnf.h" -#include "src/sat/bsat/satSolver.h" -#include "src/sat/bsat/satStore.h" +#include "aig/saig/saig.h" +#include "sat/cnf/cnf.h" +#include "sat/bsat/satSolver.h" +#include "sat/bsat/satStore.h" #include "int.h" //////////////////////////////////////////////////////////////////////// diff --git a/src/proof/int/intM114p.c b/src/proof/int/intM114p.c index ad1ff61d..4f27ee82 100644 --- a/src/proof/int/intM114p.c +++ b/src/proof/int/intM114p.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "intInt.h" -#include "src/sat/psat/m114p.h" +#include "sat/psat/m114p.h" #ifdef ABC_USE_LIBRARIES diff --git a/src/proof/int/intMan.c b/src/proof/int/intMan.c index 6fd81d7a..e419da86 100644 --- a/src/proof/int/intMan.c +++ b/src/proof/int/intMan.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "intInt.h" -#include "src/aig/ioa/ioa.h" +#include "aig/ioa/ioa.h" ABC_NAMESPACE_IMPL_START diff --git a/src/proof/live/liveness.c b/src/proof/live/liveness.c index 654e1d68..1c4d31df 100644 --- a/src/proof/live/liveness.c +++ b/src/proof/live/liveness.c @@ -19,11 +19,11 @@ ***********************************************************************/ #include -#include "src/base/main/main.h" -#include "src/aig/aig/aig.h" -#include "src/aig/saig/saig.h" +#include "base/main/main.h" +#include "aig/aig/aig.h" +#include "aig/saig/saig.h" #include -#include "src/base/main/mainInt.h" +#include "base/main/mainInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/proof/live/liveness_sim.c b/src/proof/live/liveness_sim.c index f1ad794a..3a05ebf7 100644 --- a/src/proof/live/liveness_sim.c +++ b/src/proof/live/liveness_sim.c @@ -19,9 +19,9 @@ ***********************************************************************/ #include -#include "src/base/main/main.h" -#include "src/aig/aig/aig.h" -#include "src/aig/saig/saig.h" +#include "base/main/main.h" +#include "aig/aig/aig.h" +#include "aig/saig/saig.h" #include ABC_NAMESPACE_IMPL_START diff --git a/src/proof/live/ltl_parser.c b/src/proof/live/ltl_parser.c index de567576..36d109cc 100644 --- a/src/proof/live/ltl_parser.c +++ b/src/proof/live/ltl_parser.c @@ -22,9 +22,9 @@ #include #include #include -#include "src/aig/aig/aig.h" -#include "src/base/abc/abc.h" -#include "src/base/main/mainInt.h" +#include "aig/aig/aig.h" +#include "base/abc/abc.h" +#include "base/main/mainInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/proof/llb/llb1Core.c b/src/proof/llb/llb1Core.c index b16fdee7..3aa7a6e5 100644 --- a/src/proof/llb/llb1Core.c +++ b/src/proof/llb/llb1Core.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "llbInt.h" -#include "src/aig/gia/gia.h" -#include "src/aig/gia/giaAig.h" +#include "aig/gia/gia.h" +#include "aig/gia/giaAig.h" ABC_NAMESPACE_IMPL_START diff --git a/src/proof/llb/llb4Cex.c b/src/proof/llb/llb4Cex.c index b5bdb36e..c676b76e 100644 --- a/src/proof/llb/llb4Cex.c +++ b/src/proof/llb/llb4Cex.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "llbInt.h" -#include "src/sat/cnf/cnf.h" -#include "src/sat/bsat/satSolver.h" +#include "sat/cnf/cnf.h" +#include "sat/bsat/satSolver.h" ABC_NAMESPACE_IMPL_START diff --git a/src/proof/llb/llb4Map.c b/src/proof/llb/llb4Map.c index b1442699..51f1fec6 100644 --- a/src/proof/llb/llb4Map.c +++ b/src/proof/llb/llb4Map.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "llbInt.h" -#include "src/base/abc/abc.h" -#include "src/map/if/if.h" +#include "base/abc/abc.h" +#include "map/if/if.h" ABC_NAMESPACE_IMPL_START diff --git a/src/proof/llb/llbInt.h b/src/proof/llb/llbInt.h index 58e2b543..208d291c 100644 --- a/src/proof/llb/llbInt.h +++ b/src/proof/llb/llbInt.h @@ -27,10 +27,10 @@ //////////////////////////////////////////////////////////////////////// #include -#include "src/aig/aig/aig.h" -#include "src/aig/saig/saig.h" -#include "src/proof/ssw/ssw.h" -#include "src/misc/extra/extraBdd.h" +#include "aig/aig/aig.h" +#include "aig/saig/saig.h" +#include "proof/ssw/ssw.h" +#include "misc/extra/extraBdd.h" #include "llb.h" //////////////////////////////////////////////////////////////////////// diff --git a/src/proof/pdr/pdrInt.h b/src/proof/pdr/pdrInt.h index a1432e6c..f24cb81d 100644 --- a/src/proof/pdr/pdrInt.h +++ b/src/proof/pdr/pdrInt.h @@ -25,9 +25,9 @@ /// INCLUDES /// //////////////////////////////////////////////////////////////////////// -#include "src/aig/saig/saig.h" -#include "src/sat/cnf/cnf.h" -#include "src/sat/bsat/satSolver.h" +#include "aig/saig/saig.h" +#include "sat/cnf/cnf.h" +#include "sat/bsat/satSolver.h" #include "pdr.h" ABC_NAMESPACE_HEADER_START diff --git a/src/proof/pdr/pdrInv.c b/src/proof/pdr/pdrInv.c index f9b4a55d..4b096e1b 100644 --- a/src/proof/pdr/pdrInv.c +++ b/src/proof/pdr/pdrInv.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "pdrInt.h" -#include "src/base/abc/abc.h" // for Abc_NtkCollectCioNames() -#include "src/base/main/main.h" // for Abc_FrameReadGlobalFrame() +#include "base/abc/abc.h" // for Abc_NtkCollectCioNames() +#include "base/main/main.h" // for Abc_FrameReadGlobalFrame() ABC_NAMESPACE_IMPL_START diff --git a/src/proof/ssw/sswConstr.c b/src/proof/ssw/sswConstr.c index 5459aa72..2612191d 100644 --- a/src/proof/ssw/sswConstr.c +++ b/src/proof/ssw/sswConstr.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "sswInt.h" -#include "src/sat/cnf/cnf.h" -#include "src/misc/bar/bar.h" +#include "sat/cnf/cnf.h" +#include "misc/bar/bar.h" ABC_NAMESPACE_IMPL_START diff --git a/src/proof/ssw/sswDyn.c b/src/proof/ssw/sswDyn.c index 760f457a..96f1315b 100644 --- a/src/proof/ssw/sswDyn.c +++ b/src/proof/ssw/sswDyn.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "sswInt.h" -#include "src/misc/bar/bar.h" +#include "misc/bar/bar.h" ABC_NAMESPACE_IMPL_START diff --git a/src/proof/ssw/sswFilter.c b/src/proof/ssw/sswFilter.c index 3fff79bb..047e2201 100644 --- a/src/proof/ssw/sswFilter.c +++ b/src/proof/ssw/sswFilter.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "sswInt.h" -#include "src/aig/gia/giaAig.h" +#include "aig/gia/giaAig.h" ABC_NAMESPACE_IMPL_START diff --git a/src/proof/ssw/sswInt.h b/src/proof/ssw/sswInt.h index 8749cec1..1edf2087 100644 --- a/src/proof/ssw/sswInt.h +++ b/src/proof/ssw/sswInt.h @@ -26,10 +26,10 @@ /// INCLUDES /// //////////////////////////////////////////////////////////////////////// -#include "src/aig/saig/saig.h" -#include "src/sat/bsat/satSolver.h" +#include "aig/saig/saig.h" +#include "sat/bsat/satSolver.h" #include "ssw.h" -#include "src/aig/ioa/ioa.h" +#include "aig/ioa/ioa.h" //////////////////////////////////////////////////////////////////////// /// PARAMETERS /// diff --git a/src/proof/ssw/sswPart.c b/src/proof/ssw/sswPart.c index 22340779..78ddbc5c 100644 --- a/src/proof/ssw/sswPart.c +++ b/src/proof/ssw/sswPart.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "sswInt.h" -#include "src/aig/ioa/ioa.h" +#include "aig/ioa/ioa.h" ABC_NAMESPACE_IMPL_START diff --git a/src/proof/ssw/sswRarity.c b/src/proof/ssw/sswRarity.c index 7048927f..01715e7d 100644 --- a/src/proof/ssw/sswRarity.c +++ b/src/proof/ssw/sswRarity.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "sswInt.h" -#include "src/aig/gia/giaAig.h" -#include "src/base/main/main.h" +#include "aig/gia/giaAig.h" +#include "base/main/main.h" ABC_NAMESPACE_IMPL_START diff --git a/src/proof/ssw/sswRarity2.c b/src/proof/ssw/sswRarity2.c index 1d93de60..6a67dea6 100644 --- a/src/proof/ssw/sswRarity2.c +++ b/src/proof/ssw/sswRarity2.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "sswInt.h" -#include "src/aig/gia/giaAig.h" +#include "aig/gia/giaAig.h" ABC_NAMESPACE_IMPL_START diff --git a/src/proof/ssw/sswSweep.c b/src/proof/ssw/sswSweep.c index ab6952a2..b4ff44c2 100644 --- a/src/proof/ssw/sswSweep.c +++ b/src/proof/ssw/sswSweep.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "sswInt.h" -#include "src/misc/bar/bar.h" +#include "misc/bar/bar.h" ABC_NAMESPACE_IMPL_START diff --git a/src/sat/bsat/satInterA.c b/src/sat/bsat/satInterA.c index 8b2ef8b7..39385026 100644 --- a/src/sat/bsat/satInterA.c +++ b/src/sat/bsat/satInterA.c @@ -24,7 +24,7 @@ #include #include "satStore.h" -#include "src/aig/aig/aig.h" +#include "aig/aig/aig.h" ABC_NAMESPACE_IMPL_START diff --git a/src/sat/bsat/satInterB.c b/src/sat/bsat/satInterB.c index 5a154aa0..3f7cbf4c 100644 --- a/src/sat/bsat/satInterB.c +++ b/src/sat/bsat/satInterB.c @@ -24,7 +24,7 @@ #include #include "satStore.h" -#include "src/aig/aig/aig.h" +#include "aig/aig/aig.h" ABC_NAMESPACE_IMPL_START diff --git a/src/sat/bsat/satInterP.c b/src/sat/bsat/satInterP.c index 2e3caeeb..ebcdc82f 100644 --- a/src/sat/bsat/satInterP.c +++ b/src/sat/bsat/satInterP.c @@ -24,7 +24,7 @@ #include #include "satStore.h" -#include "src/misc/vec/vec.h" +#include "misc/vec/vec.h" ABC_NAMESPACE_IMPL_START diff --git a/src/sat/bsat/satMem.h b/src/sat/bsat/satMem.h index 9dc9e692..f27f7c1e 100644 --- a/src/sat/bsat/satMem.h +++ b/src/sat/bsat/satMem.h @@ -25,7 +25,7 @@ /// INCLUDES /// //////////////////////////////////////////////////////////////////////// -#include "src/misc/util/abc_global.h" +#include "misc/util/abc_global.h" ABC_NAMESPACE_HEADER_START diff --git a/src/sat/bsat/satProof.c b/src/sat/bsat/satProof.c index f7e08592..ca8f3716 100644 --- a/src/sat/bsat/satProof.c +++ b/src/sat/bsat/satProof.c @@ -19,9 +19,9 @@ ***********************************************************************/ #include "satSolver2.h" -#include "src/misc/vec/vec.h" -#include "src/misc/vec/vecSet.h" -#include "src/aig/aig/aig.h" +#include "misc/vec/vec.h" +#include "misc/vec/vecSet.h" +#include "aig/aig/aig.h" #include "satTruth.h" ABC_NAMESPACE_IMPL_START diff --git a/src/sat/bsat/satSolver.h b/src/sat/bsat/satSolver.h index 62ad5e0c..cb9e5c39 100644 --- a/src/sat/bsat/satSolver.h +++ b/src/sat/bsat/satSolver.h @@ -29,7 +29,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA #include #include "satVec.h" -#include "src/misc/vec/vecSet.h" +#include "misc/vec/vecSet.h" ABC_NAMESPACE_HEADER_START diff --git a/src/sat/bsat/satSolver2.h b/src/sat/bsat/satSolver2.h index ffab91be..d1179422 100644 --- a/src/sat/bsat/satSolver2.h +++ b/src/sat/bsat/satSolver2.h @@ -29,7 +29,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA #include #include "satVec.h" -#include "src/misc/vec/vecSet.h" +#include "misc/vec/vecSet.h" ABC_NAMESPACE_HEADER_START diff --git a/src/sat/bsat/satTruth.c b/src/sat/bsat/satTruth.c index b2e7dda9..306887a1 100644 --- a/src/sat/bsat/satTruth.c +++ b/src/sat/bsat/satTruth.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "satTruth.h" -#include "src/misc/vec/vecSet.h" +#include "misc/vec/vecSet.h" ABC_NAMESPACE_IMPL_START diff --git a/src/sat/bsat/satTruth.h b/src/sat/bsat/satTruth.h index dcbf6526..d44bf617 100644 --- a/src/sat/bsat/satTruth.h +++ b/src/sat/bsat/satTruth.h @@ -29,7 +29,7 @@ #include #include #include -#include "src/misc/util/abc_global.h" +#include "misc/util/abc_global.h" ABC_NAMESPACE_HEADER_START diff --git a/src/sat/bsat/satVec.h b/src/sat/bsat/satVec.h index 61a45ca7..27eed39a 100644 --- a/src/sat/bsat/satVec.h +++ b/src/sat/bsat/satVec.h @@ -22,7 +22,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA #ifndef ABC__sat__bsat__satVec_h #define ABC__sat__bsat__satVec_h -#include "src/misc/util/abc_global.h" +#include "misc/util/abc_global.h" ABC_NAMESPACE_HEADER_START diff --git a/src/sat/cnf/cnf.h b/src/sat/cnf/cnf.h index 16aaa21f..1119db3e 100644 --- a/src/sat/cnf/cnf.h +++ b/src/sat/cnf/cnf.h @@ -31,9 +31,9 @@ #include #include -#include "src/misc/vec/vec.h" -#include "src/aig/aig/aig.h" -#include "src/opt/dar/darInt.h" +#include "misc/vec/vec.h" +#include "aig/aig/aig.h" +#include "opt/dar/darInt.h" //////////////////////////////////////////////////////////////////////// /// PARAMETERS /// diff --git a/src/sat/cnf/cnfCut.c b/src/sat/cnf/cnfCut.c index fef199c7..ee9dcfa7 100644 --- a/src/sat/cnf/cnfCut.c +++ b/src/sat/cnf/cnfCut.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "cnf.h" -#include "src/bool/kit/kit.h" +#include "bool/kit/kit.h" ABC_NAMESPACE_IMPL_START diff --git a/src/sat/cnf/cnfFast.c b/src/sat/cnf/cnfFast.c index 93b3072b..c0202ad5 100644 --- a/src/sat/cnf/cnfFast.c +++ b/src/sat/cnf/cnfFast.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "cnf.h" -#include "src/bool/kit/kit.h" +#include "bool/kit/kit.h" ABC_NAMESPACE_IMPL_START diff --git a/src/sat/cnf/cnfMan.c b/src/sat/cnf/cnfMan.c index c3099d1e..10043882 100644 --- a/src/sat/cnf/cnfMan.c +++ b/src/sat/cnf/cnfMan.c @@ -19,9 +19,9 @@ ***********************************************************************/ #include "cnf.h" -#include "src/sat/bsat/satSolver.h" -#include "src/sat/bsat/satSolver2.h" -#include "src/misc/zlib/zlib.h" +#include "sat/bsat/satSolver.h" +#include "sat/bsat/satSolver2.h" +#include "misc/zlib/zlib.h" ABC_NAMESPACE_IMPL_START diff --git a/src/sat/csat/csat_apis.c b/src/sat/csat/csat_apis.c index 582dc1e7..38c9c7e2 100644 --- a/src/sat/csat/csat_apis.c +++ b/src/sat/csat/csat_apis.c @@ -16,11 +16,11 @@ ***********************************************************************/ -#include "src/base/abc/abc.h" -#include "src/proof/fraig/fraig.h" +#include "base/abc/abc.h" +#include "proof/fraig/fraig.h" #include "csat_apis.h" -#include "src/misc/st/stmm.h" -#include "src/base/main/main.h" +#include "misc/st/stmm.h" +#include "base/main/main.h" ABC_NAMESPACE_IMPL_START diff --git a/src/sat/msat/msatInt.h b/src/sat/msat/msatInt.h index a1d9e14d..d1e71371 100644 --- a/src/sat/msat/msatInt.h +++ b/src/sat/msat/msatInt.h @@ -32,7 +32,7 @@ #include #include -#include "src/misc/util/abc_global.h" +#include "misc/util/abc_global.h" #include "msat.h" ABC_NAMESPACE_HEADER_START diff --git a/src/sat/proof/pr.c b/src/sat/proof/pr.c index f559d851..7fbe3803 100644 --- a/src/sat/proof/pr.c +++ b/src/sat/proof/pr.c @@ -23,7 +23,7 @@ #include #include -#include "src/misc/util/abc_global.h" +#include "misc/util/abc_global.h" #include "pr.h" ABC_NAMESPACE_IMPL_START -- cgit v1.2.3