more files to ignore in cvs commands (setup.h, lex_yy.c, y_tab.c)

[wxWidgets.git] / utils / dialoged / src / makefile.g95

diff --git a/utils/dialoged/src/makefile.g95 b/utils/dialoged/src/makefile.g95
index 06db47a2fb66fb8e8bc9c87db242a1e922196140..b886f57febf983424b5ad0f97aeb745d0e152947 100644 (file)
--- a/utils/dialoged/src/makefile.g95
+++ b/utils/dialoged/src/makefile.g95
@@ -19,17 +19,7 @@ OBJECTS = $(OBJDIR)/dialoged.$(OBJSUFF) $(OBJDIR)/reseditr.$(OBJSUFF)\
  $(OBJDIR)/edlist.$(OBJSUFF) $(OBJDIR)/edtree.$(OBJSUFF) $(OBJDIR)/winstyle.$(OBJSUFF) $(OBJDIR)/symbtabl.$(OBJSUFF)\
  $(OBJDIR)/dialoged_resources.$(OBJSUFF)
 
-EXTRAINC = -I../../wxprop/src
-
-LDFLAGS =  -Wl,--subsystem,windows -mwindows -L$(WXDIR)/lib -L../../wxprop/lib
-LDLIBS=-lwxprop $(LIBS)
-
-CPPFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) -DDEBUG='$(DEBUG)' $(WARN) $(OPT) $(EXTRAINC)
-
-all:    $(OBJDIR) wxprop dialoged$(GUISUFFIX)$(EXESUFF)
-
-wxprop:
-       cd ../../wxprop/src; $(MAKE) -f makefile.g95
+all:    $(OBJDIR) dialoged$(GUISUFFIX)$(EXESUFF)
 
 $(OBJDIR):
        mkdir $(OBJDIR)
@@ -40,16 +30,16 @@ dialoged$(GUISUFFIX)$(EXESUFF):     $(OBJECTS) $(WXLIB)
 $(OBJDIR)/dialoged.$(OBJSUFF): dialoged.$(SRCSUFF)
        $(CC) -c $(CPPFLAGS) -o $@ dialoged.$(SRCSUFF)
 
-$(OBJDIR)/winprop.$(OBJSUFF):  winprop.h reseditr.h editrpal.h winprop.$(SRCSUFF)
+$(OBJDIR)/winprop.$(OBJSUFF):  winprop.h reseditr.h winprop.$(SRCSUFF)
        $(CC) -c $(CPPFLAGS) -o $@ winprop.$(SRCSUFF)
 
-$(OBJDIR)/reswrite.$(OBJSUFF): winprop.h reseditr.h editrpal.h reswrite.$(SRCSUFF)
+$(OBJDIR)/reswrite.$(OBJSUFF): winprop.h reseditr.h reswrite.$(SRCSUFF)
        $(CC) -c $(CPPFLAGS) -o $@ reswrite.$(SRCSUFF)
 
-$(OBJDIR)/reseditr.$(OBJSUFF): winprop.h reseditr.h editrpal.h reseditr.$(SRCSUFF)
+$(OBJDIR)/reseditr.$(OBJSUFF): winprop.h reseditr.h reseditr.$(SRCSUFF)
        $(CC) -c $(CPPFLAGS) -o $@ reseditr.$(SRCSUFF)
 
-$(OBJDIR)/dlghndlr.$(OBJSUFF): winprop.h reseditr.h editrpal.h dlghndlr.$(SRCSUFF)
+$(OBJDIR)/dlghndlr.$(OBJSUFF): winprop.h reseditr.h dlghndlr.$(SRCSUFF)
        $(CC) -c $(CPPFLAGS) -o $@ dlghndlr.$(SRCSUFF)
 
 $(OBJDIR)/edlist.$(OBJSUFF):   winprop.h edlist.h edlist.$(SRCSUFF)
@@ -59,10 +49,10 @@ $(OBJDIR)/edtree.$(OBJSUFF):        winprop.h edtree.h edtree.$(SRCSUFF)
        $(CC) -c $(CPPFLAGS) -o $@ edtree.$(SRCSUFF)
 
 $(OBJDIR)/winstyle.$(OBJSUFF): winstyle.h winstyle.$(SRCSUFF)
-       $(CC) -c $(CPPFLAGS) -o $@ edtree.$(SRCSUFF)
+       $(CC) -c $(CPPFLAGS) -o $@ winstyle.$(SRCSUFF)
 
 $(OBJDIR)/symbtabl.$(OBJSUFF): symbtabl.h symbtabl.$(SRCSUFF)
-       $(CC) -c $(CPPFLAGS) -o $@ edtree.$(SRCSUFF)
+       $(CC) -c $(CPPFLAGS) -o $@ symbtabl.$(SRCSUFF)
 
 $(OBJDIR)/dialoged_resources.o:  dialoged.rc
        $(RESCOMP) -i dialoged.rc -o $(OBJDIR)/dialoged_resources.o $(RESFLAGS)