wxUniversal fixes:

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

diff --git a/utils/dialoged/src/makefile.g95 b/utils/dialoged/src/makefile.g95
index 22fba5095185ba05bd8a56344da12ec9aaad6b38..7bf29275c36cf4c1a36536e5965247c9d515a18f 100644 (file)
--- a/utils/dialoged/src/makefile.g95
+++ b/utils/dialoged/src/makefile.g95
@@ -1,61 +1,17 @@
 #
 #

-# File:                makefile.g95
-# Author:      Julian Smart
-# Created:     1996
-# Updated:     
+# File:         makefile.g95
+# Author:       Julian Smart
+# Created:      1999
+# Updated:
+# Copyright:    (c) Julian Smart, 1999

 #
 #

-# "%W% %G%"
-#
-# Makefile for Dialog Editor (GNU-WIN32)
+# Makefile for wxWindows Dialog Editor (Cygwin/Mingw32).

 
 WXDIR = ../../..
 
 
 WXDIR = ../../..
 

-# All common UNIX compiler flags and options are now in
-# this central makefile.
-include $(WXDIR)/src/makeg95.env
-
-OBJECTS = $(OBJDIR)/dialoged.$(OBJSUFF) $(OBJDIR)/editrpal.$(OBJSUFF) $(OBJDIR)/reseditr.$(OBJSUFF)\
- $(OBJDIR)/dlghndlr.$(OBJSUFF) $(OBJDIR)/reswrite.$(OBJSUFF) $(OBJDIR)/winprop.$(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
-
-$(OBJDIR):
-       mkdir $(OBJDIR)
-
-dialoged$(GUISUFFIX)$(EXESUFF):        $(OBJECTS) $(WXLIB)
-       $(CC) $(LDFLAGS) -o dialoged$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(XVIEW_LINK) $(LDLIBS)
-
-$(OBJDIR)/dialoged.$(OBJSUFF): dialoged.$(SRCSUFF)
-       $(CC) -c $(CPPFLAGS) -o $@ dialoged.$(SRCSUFF)
-
-$(OBJDIR)/editrpal.$(OBJSUFF): winprop.h reseditr.h editrpal.h editrpal.$(SRCSUFF)
-       $(CC) -c $(CPPFLAGS) -o $@ editrpal.$(SRCSUFF)
-
-$(OBJDIR)/winprop.$(OBJSUFF):  winprop.h reseditr.h editrpal.h winprop.$(SRCSUFF)
-       $(CC) -c $(CPPFLAGS) -o $@ winprop.$(SRCSUFF)
-
-$(OBJDIR)/reswrite.$(OBJSUFF): winprop.h reseditr.h editrpal.h reswrite.$(SRCSUFF)
-       $(CC) -c $(CPPFLAGS) -o $@ reswrite.$(SRCSUFF)
-
-$(OBJDIR)/reseditr.$(OBJSUFF): winprop.h reseditr.h editrpal.h reseditr.$(SRCSUFF)
-       $(CC) -c $(CPPFLAGS) -o $@ reseditr.$(SRCSUFF)
-
-$(OBJDIR)/dlghndlr.$(OBJSUFF): winprop.h reseditr.h editrpal.h dlghndlr.$(SRCSUFF)
-       $(CC) -c $(CPPFLAGS) -o $@ dlghndlr.$(SRCSUFF)
+TARGET=dialoged
+OBJECTS = $(TARGET).o reseditr.o dlghndlr.o reswrite.o\
+  winprop.o edtree.o edlist.o symbtabl.o winstyle.o

 
 

-$(OBJDIR)/dialoged_resources.o:  dialoged.rc
-       $(RESCOMP) -i dialoged.rc -o $(OBJDIR)/dialoged_resources.o $(RESFLAGS)
+include $(WXDIR)/src/makeprog.g95

 
 

-clean:
-       rm -f $(OBJECTS) dialoged$(GUISUFFIX).exe core *.rsc *.res