]> git.mdlowis.com Git - projs/tide.git/commitdiff
fixed linker issues with new test binary
authorMichael D. Lowis <mike.lowis@gentex.com>
Wed, 27 Feb 2019 15:10:03 +0000 (10:10 -0500)
committerMichael D. Lowis <mike.lowis@gentex.com>
Wed, 27 Feb 2019 15:10:03 +0000 (10:10 -0500)
.gitignore
Makefile
config.mk
inc/x11.h
tests/test_tide [deleted file]

index 4ca82766d96d0ac01cda6772a53e8ec98170dc01..0ed572ec62dea3f0d70e1fcd52d753c22ab73f00 100644 (file)
@@ -58,3 +58,4 @@ flaws.txt
 edit
 registrar
 fetch
+tests/test_tide
index d7533211a0d62d31450d82e05367c128dbf16f62..7d3c61c64046f97fd967f96a08b189eadc82ff02 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -51,13 +51,14 @@ libedit.a: $(LIBEDIT_OBJS)
        $(AR) $(ARFLAGS) $@ $^
 
 tests/libedit: tests/libedit.o tests/lib/buf.o tests/lib/utf8.o libedit.a
+tests/test_tide: libedit.a
 
 # define implicit rule for building normal binaries
 bin/%: src/%.o libedit.a
        $(LD) -o $@ $^ $(LDFLAGS)
 
 # define implicit rule for building tests binaries
-tests/%: tests/%.o libedit.a
+tests/%: tests/%.o
        $(LD) -o $@ $^ $(LDFLAGS)
 
 # load generate dependencies
index f32c2a829d3ba124cfda4740a2c1f1b208d7c831..6eadce4027492c51696b63f2d2048dc40f537c85 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -10,7 +10,7 @@ PREFIX = $(HOME)
 INCS += -I/usr/X11/include \
                -I/usr/X11/include/freetype2 \
                -I.
-LIBS += -L/usr/X11/lib
+LIBS += -L. -L/usr/X11/lib
 
 # Linux Freetype2 Flags
 INCS += -I/usr/include/freetype2
index 79e351376ce86aa761c864519d33aef80721ce45..effc431e50e95dee8d8faedfec02f52f9f5dc612 100644 (file)
--- a/inc/x11.h
+++ b/inc/x11.h
@@ -1,4 +1,3 @@
-/* library dependencies */
 AUTOLIB(X11)
 AUTOLIB(Xinerama)
 AUTOLIB(Xft)
diff --git a/tests/test_tide b/tests/test_tide
deleted file mode 100755 (executable)
index 8098b76..0000000
Binary files a/tests/test_tide and /dev/null differ