diff options
| -rw-r--r-- | Makefile.in | 20 | ||||
| -rw-r--r-- | doc/ghw/index.rst | 4 | ||||
| -rw-r--r-- | ghw/ghwdump.c | 2 | ||||
| -rw-r--r-- | ghw/libghw.c (renamed from ghw/ghwlib.c) | 2 | ||||
| -rw-r--r-- | ghw/libghw.h (renamed from ghw/ghwlib.h) | 0 |
5 files changed, 14 insertions, 14 deletions
diff --git a/Makefile.in b/Makefile.in index 561510bc5..082596174 100644 --- a/Makefile.in +++ b/Makefile.in @@ -472,33 +472,33 @@ libghdl-py.tgz: ################ ghwdump ################################################# -GHWDUMP_OBJS=ghwdump.o ghwlib.o +GHWDUMP_OBJS=ghwdump.o libghw.o ghwdump: ghwdump$(EXEEXT) ghwdump$(EXEEXT): $(GHWDUMP_OBJS) $(CC) -o $@ $(GHWDUMP_OBJS) -ghwlib$(SOEXT): ghwlib.o - $(CC) $(PIC_FLAGS) -shared -o lib/$@ ghwlib.o +libghw$(SOEXT): libghw.o + $(CC) $(PIC_FLAGS) -shared -o lib/$@ libghw.o -ghwdump.o: $(srcdir)/ghw/ghwdump.c $(srcdir)/ghw/ghwlib.h +ghwdump.o: $(srcdir)/ghw/ghwdump.c $(srcdir)/ghw/libghw.h $(CC) -c -o $@ $< $(OPT_FLAGS) $(WARN_CFLAGS) -ghwlib.o: $(srcdir)/ghw/ghwlib.c $(srcdir)/ghw/ghwlib.h +libghw.o: $(srcdir)/ghw/libghw.c $(srcdir)/ghw/libghw.h $(CC) $(PIC_FLAGS) -c -o $@ $< $(OPT_FLAGS) $(WARN_CFLAGS) -all.ghw: ghwdump$(EXEEXT) ghwlib$(SOEXT) +all.ghw: ghwdump$(EXEEXT) libghw$(SOEXT) install.ghw: $(INSTALL_PROGRAM) -p ghwdump$(EXEEXT) $(DESTDIR)$(bindir)/ - $(INSTALL_PROGRAM) -p lib/ghwlib$(SOEXT) $(DESTDIR)$(libdir)/ - $(INSTALL_DATA) -p $(srcdir)/ghw/ghwlib.h $(DESTDIR)$(incdir)/ghdl/ + $(INSTALL_PROGRAM) -p lib/libghw$(SOEXT) $(DESTDIR)$(libdir)/ + $(INSTALL_DATA) -p $(srcdir)/ghw/libghw.h $(DESTDIR)$(incdir)/ghdl/ uninstall.ghw: $(RM) $(DESTDIR)$(bindir)/ghwdump$(EXEEXT) - $(RM) $(DESTDIR)$(libdir)/ghwlib$(EXEEXT) - $(RM) -f $(DESTDIR)$(incdir)/ghdl/ghwlib.h + $(RM) $(DESTDIR)$(libdir)/libghw$(EXEEXT) + $(RM) -f $(DESTDIR)$(incdir)/ghdl/libghw.h ############### grt ##################################################### diff --git a/doc/ghw/index.rst b/doc/ghw/index.rst index af8a12384..bc3d7284f 100644 --- a/doc/ghw/index.rst +++ b/doc/ghw/index.rst @@ -13,7 +13,7 @@ However, VCD/EVCD cannot handle certain signal types from the VHDL language. There is neither any equivalent in the VHDL LRM. So, the author of GHDL, Tristan Gingold, implemented an alternative format named GHW, for allowing all VHDL types to be dumped. -He also contributed a reader to GTKWave based on ghwlib (see `gtkwave/gtkwave/search?q=ghwlib <https://github.com/gtkwave/gtkwave/search?q=ghwlib>`__ and `gtkwave/gtkwave: gtkwave3/src/ghw.c <https://github.com/gtkwave/gtkwave/blob/master/gtkwave3/src/ghw.c>`__), +He also contributed a reader to GTKWave based on libghw (see `gtkwave/gtkwave/search?q=libghw <https://github.com/gtkwave/gtkwave/search?q=libghw>`__ and `gtkwave/gtkwave: gtkwave3/src/ghw.c <https://github.com/gtkwave/gtkwave/blob/master/gtkwave3/src/ghw.c>`__), which allows visualizing GHW waves . The GHW format is not completely fixed, and it might change slightly as new language features are implemented in GHDL @@ -24,7 +24,7 @@ Nevertheless, the GHDL codebase (:ghdlsrc:`grt/grt-waves.adb <grt/grt-waves.adb> In `nturley/ghw-notes <https://github.com/nturley/ghw-notes>`__, there is some work for defining the GHW format as a Kaitai Struct (see `kaitai.io <https://kaitai.io/>`__). -ghwlib +libghw ====== GHW reading features are provided as a shared library, which is built and installed with GHDL by default. diff --git a/ghw/ghwdump.c b/ghw/ghwdump.c index 2acb0cab5..fe74e5f9a 100644 --- a/ghw/ghwdump.c +++ b/ghw/ghwdump.c @@ -22,7 +22,7 @@ #include <string.h> #include <unistd.h> -#include "ghwlib.h" +#include "libghw.h" static const char *progname; void diff --git a/ghw/ghwlib.c b/ghw/libghw.c index cb90fbcdf..eabc31cba 100644 --- a/ghw/ghwlib.c +++ b/ghw/libghw.c @@ -21,7 +21,7 @@ #include <string.h> #include <unistd.h> -#include "ghwlib.h" +#include "libghw.h" /* Reopen H through decompressor DECOMP. */ diff --git a/ghw/ghwlib.h b/ghw/libghw.h index 3efa65721..3efa65721 100644 --- a/ghw/ghwlib.h +++ b/ghw/libghw.h |