Changeset 314 for trunk/tests

Timestamp:

Oct 21, 2007, 1:29:02 PM (18 years ago)

Author:

cinc

Message:

Fixed build for test app. Doesn't mean the test app does something useful though...

File:

• trunk/tests/Makefile (modified) (3 diffs)

trunk/tests/Makefile

@@ -18 +18 @@
 IDLDIR          =       ./idl
 
-TKIDLDIR        =       $(NOMPATH)/idl  # The object TK lives here
+# The object TK lives here
+TKIDLDIR        =       $(NOMPATH)/idl
 
 INC             =       ./include -I ./class_h \
@@ -29 +30 @@
 
 
-ADDLIBS         =        -l$(OBJDIR)/nobjtk -l$(OBJDIR)/nomtest -l$(OBJDIR)/nobjtk
+NOMTKLIB        =       -l$(OBJDIR)/nobjtk
+ADDLIBS         =       -l$(OBJDIR)/nomtest $(NOMTKLIB) 
 
 # Define objects to build
@@ -52 +54 @@
         @echo "[33;1;mLinking "$@"...[0;m"
         @cmd.exe /C create_$(DLLNAME)_def $(OBJDIR)/$(DLLNAME).def
-        $(CC) $(GCCLDFLAGS) -o $@ $(CLASSOBJECTS) $(LIBS) $(ADDLIBS) $(OBJDIR)/$(DLLNAME).def
+        $(CC) $(GCCLDFLAGS) -o $@ $(CLASSOBJECTS) $(LIBS) $(NOMTKLIB) $(OBJDIR)/$(DLLNAME).def
         emximp -o $(OBJDIR)/$(basename $(notdir $@)).a $(OBJDIR)/$(DLLNAME).def
         @echo "[32;1;mDone linking "$@"...[0;m"