diff options
| author | Ian Lynagh <igloo@earth.li> | 2009-04-26 11:42:15 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2009-04-26 11:42:15 +0000 |
| commit | 34cc75e1a62638f2833815746ebce0a9114dc26b (patch) | |
| tree | ef21e8fd7af1356beea9cce7d6efb8a65374e24c /utils/hp2ps | |
| parent | 74e1368d4688ee16f6decdf2cd3ebe27506b26ba (diff) | |
| download | haskell-34cc75e1a62638f2833815746ebce0a9114dc26b.tar.gz | |
GHC new build system megapatch
Diffstat (limited to 'utils/hp2ps')
| -rw-r--r-- | utils/hp2ps/Main.h | 2 | ||||
| -rw-r--r-- | utils/hp2ps/Makefile | 23 | ||||
| -rw-r--r-- | utils/hp2ps/ghc.mk | 10 |
3 files changed, 14 insertions, 21 deletions
diff --git a/utils/hp2ps/Main.h b/utils/hp2ps/Main.h index 81c62dc891..0d0d75f847 100644 --- a/utils/hp2ps/Main.h +++ b/utils/hp2ps/Main.h @@ -1,7 +1,7 @@ #ifndef MAIN_H #define MAIN_H -#include "../includes/ghcconfig.h" +#include "ghcconfig.h" #include <stdio.h> #ifdef __STDC__ diff --git a/utils/hp2ps/Makefile b/utils/hp2ps/Makefile index 93aa856ffc..ed3dff8b21 100644 --- a/utils/hp2ps/Makefile +++ b/utils/hp2ps/Makefile @@ -1,20 +1,3 @@ -TOP=../.. -include $(TOP)/mk/boilerplate.mk - -SRC_CC_OPTS += $(MACOSX_DEPLOYMENT_CC_OPTS) -SRC_LD_OPTS += $(MACOSX_DEPLOYMENT_LD_OPTS) - -C_PROG = hp2ps - -SRC_CC_OPTS += -I$(GHC_INCLUDE_DIR) -Wall - -INSTALL_PROGS += $(C_PROG) - -LIBS = $(LIBM) - -CLEAN_FILES += $(C_OBJS) $(C_PROG) - -BINDIST_EXTRAS += $(C_PROG) -include $(TOP)/mk/bindist.mk - -include $(TOP)/mk/target.mk +dir = utils/hp2ps +TOP = ../.. +include $(TOP)/mk/sub-makefile.mk diff --git a/utils/hp2ps/ghc.mk b/utils/hp2ps/ghc.mk new file mode 100644 index 0000000000..75964e1e39 --- /dev/null +++ b/utils/hp2ps/ghc.mk @@ -0,0 +1,10 @@ +utils/hp2ps_dist_C_SRCS = AreaBelow.c Curves.c Error.c Main.c \ + Reorder.c TopTwenty.c AuxFile.c Deviation.c \ + HpFile.c Marks.c Scale.c TraceElement.c \ + Axes.c Dimensions.c Key.c PsFile.c Shade.c \ + Utilities.c +utils/hp2ps_dist_PROG = hp2ps$(exeext) +utils/hp2ps_dist_INSTALL = YES + +$(eval $(call build-prog,utils/hp2ps,dist,0)) + |